diff --git a/packages/davinci-client/api-report/davinci-client.api.md b/packages/davinci-client/api-report/davinci-client.api.md
index e937b32655..82dc98f307 100644
--- a/packages/davinci-client/api-report/davinci-client.api.md
+++ b/packages/davinci-client/api-report/davinci-client.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+
 import { ActionCreatorWithPayload } from '@reduxjs/toolkit';
 import { ActionTypes } from '@forgerock/sdk-request-middleware';
 import type { AsyncLegacyConfigOptions } from '@forgerock/sdk-types';
@@ -24,427 +25,305 @@ import { SerializedError } from '@reduxjs/toolkit';
 import { Unsubscribe } from '@reduxjs/toolkit';
 
 // @public (undocumented)
-export type ActionCollector<T extends ActionCollectorTypes> =
-  | ActionCollectorNoUrl<T>
-  | ActionCollectorWithUrl<T>;
+export type ActionCollector<T extends ActionCollectorTypes> = ActionCollectorNoUrl<T> | ActionCollectorWithUrl<T>;
 
 // @public (undocumented)
 export interface ActionCollectorNoUrl<T extends ActionCollectorTypes> {
-  // (undocumented)
-  category: 'ActionCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'ActionCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type ActionCollectors =
-  | ActionCollectorWithUrl<'IdpCollector'>
-  | ActionCollectorNoUrl<'ActionCollector'>
-  | ActionCollectorNoUrl<'FlowCollector'>
-  | ActionCollectorNoUrl<'SubmitCollector'>;
+export type ActionCollectors = ActionCollectorWithUrl<'IdpCollector'> | ActionCollectorNoUrl<'ActionCollector'> | ActionCollectorNoUrl<'FlowCollector'> | ActionCollectorNoUrl<'SubmitCollector'>;
 
 // @public
-export type ActionCollectorTypes =
-  | 'FlowCollector'
-  | 'SubmitCollector'
-  | 'IdpCollector'
-  | 'ActionCollector';
+export type ActionCollectorTypes = 'FlowCollector' | 'SubmitCollector' | 'IdpCollector' | 'ActionCollector';
 
 // @public (undocumented)
 export interface ActionCollectorWithUrl<T extends ActionCollectorTypes> {
-  // (undocumented)
-  category: 'ActionCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    url?: string | null;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'ActionCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        url?: string | null;
+    };
+    // (undocumented)
+    type: T;
 }
 
-export { ActionTypes };
+export { ActionTypes }
 
 // @public (undocumented)
 export interface AgreementCollector extends NoValueCollectorBase<'AgreementCollector'> {
-  // (undocumented)
-  output: {
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        titleEnabled: boolean;
+        title: string;
+        agreement: {
+            id: string;
+            useDynamicAgreement: boolean;
+        };
+        enabled: boolean;
+    };
+}
+
+// @public (undocumented)
+export type AgreementField = {
+    type: 'AGREEMENT';
     key: string;
-    label: string;
-    type: string;
+    content: string;
     titleEnabled: boolean;
     title: string;
     agreement: {
-      id: string;
-      useDynamicAgreement: boolean;
+        id: string;
+        useDynamicAgreement: boolean;
     };
     enabled: boolean;
-  };
-}
-
-// @public (undocumented)
-export type AgreementField = {
-  type: 'AGREEMENT';
-  key: string;
-  content: string;
-  titleEnabled: boolean;
-  title: string;
-  agreement: {
-    id: string;
-    useDynamicAgreement: boolean;
-  };
-  enabled: boolean;
 };
 
 // @public (undocumented)
-export interface AssertionValue extends Omit<
-  PublicKeyCredential,
-  'rawId' | 'response' | 'getClientExtensionResults' | 'toJSON'
-> {
-  // (undocumented)
-  rawId: string;
-  // (undocumented)
-  response: {
-    clientDataJSON: string;
-    authenticatorData: string;
-    signature: string;
-    userHandle: string | null;
-  };
+export interface AssertionValue extends Omit<PublicKeyCredential, 'rawId' | 'response' | 'getClientExtensionResults' | 'toJSON'> {
+    // (undocumented)
+    rawId: string;
+    // (undocumented)
+    response: {
+        clientDataJSON: string;
+        authenticatorData: string;
+        signature: string;
+        userHandle: string | null;
+    };
 }
 
 // @public (undocumented)
-export interface AttestationValue extends Omit<
-  PublicKeyCredential,
-  'rawId' | 'response' | 'getClientExtensionResults' | 'toJSON'
-> {
-  // (undocumented)
-  rawId: string;
-  // (undocumented)
-  response: {
-    clientDataJSON: string;
-    attestationObject: string;
-  };
+export interface AttestationValue extends Omit<PublicKeyCredential, 'rawId' | 'response' | 'getClientExtensionResults' | 'toJSON'> {
+    // (undocumented)
+    rawId: string;
+    // (undocumented)
+    response: {
+        clientDataJSON: string;
+        attestationObject: string;
+    };
 }
 
 // @public (undocumented)
-export interface AutoCollector<
-  C extends AutoCollectorCategories,
-  T extends AutoCollectorTypes,
-  IV = string,
-  OV = Record<string, unknown>,
-> {
-  // (undocumented)
-  category: C;
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: IV;
-    type: string;
-    validation?: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    type: string;
-    config: OV;
-  };
-  // (undocumented)
-  type: T;
+export interface AutoCollector<C extends AutoCollectorCategories, T extends AutoCollectorTypes, IV = string, OV = Record<string, unknown>> {
+    // (undocumented)
+    category: C;
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: IV;
+        type: string;
+        validation?: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        type: string;
+        config: OV;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
 export type AutoCollectorCategories = 'SingleValueAutoCollector' | 'ObjectValueAutoCollector';
 
 // @public (undocumented)
-export type AutoCollectors =
-  | ProtectCollector
-  | FidoRegistrationCollector
-  | FidoAuthenticationCollector
-  | PollingCollector
-  | SingleValueAutoCollector
-  | ObjectValueAutoCollector;
+export type AutoCollectors = ProtectCollector | FidoRegistrationCollector | FidoAuthenticationCollector | PollingCollector | SingleValueAutoCollector | ObjectValueAutoCollector;
 
 // @public (undocumented)
 export type AutoCollectorTypes = SingleValueAutoCollectorTypes | ObjectValueAutoCollectorTypes;
 
 // @public (undocumented)
 export interface CollectorErrors {
-  // (undocumented)
-  code: string;
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  target: string;
-}
-
-// @public
-export interface CollectorRichContent {
-  // (undocumented)
-  content: string;
-  // (undocumented)
-  replacements: RichContentLink[];
+    // (undocumented)
+    code: string;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    target: string;
 }
 
 // @public (undocumented)
-export type Collectors =
-  | FlowCollector
-  | PasswordCollector
-  | ValidatedPasswordCollector
-  | TextCollector
-  | SingleSelectCollector
-  | IdpCollector
-  | SubmitCollector
-  | ActionCollector<'ActionCollector'>
-  | SingleValueCollector<'SingleValueCollector'>
-  | MultiSelectCollector
-  | DeviceAuthenticationCollector
-  | DeviceRegistrationCollector
-  | PhoneNumberCollector
-  | PhoneNumberExtensionCollector
-  | ReadOnlyCollector
-  | RichTextCollector
-  | ValidatedTextCollector
-  | ProtectCollector
-  | PollingCollector
-  | FidoRegistrationCollector
-  | FidoAuthenticationCollector
-  | QrCodeCollector
-  | AgreementCollector
-  | UnknownCollector;
+export type Collectors = FlowCollector | PasswordCollector | TextCollector | SingleSelectCollector | IdpCollector | SubmitCollector | ActionCollector<'ActionCollector'> | SingleValueCollector<'SingleValueCollector'> | MultiSelectCollector | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector | ReadOnlyCollector | ValidatedTextCollector | ProtectCollector | PollingCollector | FidoRegistrationCollector | FidoAuthenticationCollector | QrCodeCollector | AgreementCollector | UnknownCollector;
 
 // @public
 export type CollectorValueType<T> = T extends {
-  type: 'PasswordCollector';
-}
-  ? string
-  : T extends {
-        type: 'ValidatedPasswordCollector';
-      }
-    ? string
-    : T extends {
-          type: 'TextCollector';
-          category: 'SingleValueCollector';
-        }
-      ? string
-      : T extends {
-            type: 'TextCollector';
-            category: 'ValidatedSingleValueCollector';
-          }
-        ? string
-        : T extends {
-              type: 'SingleSelectCollector';
-            }
-          ? string
-          : T extends {
-                type: 'MultiSelectCollector';
-              }
-            ? string[]
-            : T extends {
-                  type: 'DeviceRegistrationCollector';
-                }
-              ? string
-              : T extends {
-                    type: 'DeviceAuthenticationCollector';
-                  }
-                ? string
-                : T extends {
-                      type: 'PhoneNumberCollector';
-                    }
-                  ? PhoneNumberInputValue
-                  : T extends {
-                        type: 'FidoRegistrationCollector';
-                      }
-                    ? FidoRegistrationInputValue
-                    : T extends {
-                          type: 'FidoAuthenticationCollector';
-                        }
-                      ? FidoAuthenticationInputValue
-                      : T extends {
-                            category: 'SingleValueCollector';
-                          }
-                        ? string
-                        : T extends {
-                              category: 'ValidatedSingleValueCollector';
-                            }
-                          ? string
-                          : T extends {
-                                category: 'MultiValueCollector';
-                              }
-                            ? string[]
-                            :
-                                | string
-                                | string[]
-                                | PhoneNumberInputValue
-                                | FidoRegistrationInputValue
-                                | FidoAuthenticationInputValue;
-
-// @public (undocumented)
-export type ComplexValueFields =
-  | DeviceAuthenticationField
-  | DeviceRegistrationField
-  | PhoneNumberField
-  | PhoneNumberExtensionField
-  | FidoRegistrationField
-  | FidoAuthenticationField
-  | PollingField;
+    type: 'PasswordCollector';
+} ? string : T extends {
+    type: 'TextCollector';
+    category: 'SingleValueCollector';
+} ? string : T extends {
+    type: 'TextCollector';
+    category: 'ValidatedSingleValueCollector';
+} ? string : T extends {
+    type: 'SingleSelectCollector';
+} ? string : T extends {
+    type: 'MultiSelectCollector';
+} ? string[] : T extends {
+    type: 'DeviceRegistrationCollector';
+} ? string : T extends {
+    type: 'DeviceAuthenticationCollector';
+} ? string : T extends {
+    type: 'PhoneNumberCollector';
+} ? PhoneNumberInputValue : T extends {
+    type: 'FidoRegistrationCollector';
+} ? FidoRegistrationInputValue : T extends {
+    type: 'FidoAuthenticationCollector';
+} ? FidoAuthenticationInputValue : T extends {
+    category: 'SingleValueCollector';
+} ? string : T extends {
+    category: 'ValidatedSingleValueCollector';
+} ? string : T extends {
+    category: 'MultiValueCollector';
+} ? string[] : string | string[] | PhoneNumberInputValue | FidoRegistrationInputValue | FidoAuthenticationInputValue;
+
+// @public (undocumented)
+export type ComplexValueFields = DeviceAuthenticationField | DeviceRegistrationField | PhoneNumberField | FidoRegistrationField | FidoAuthenticationField | PollingField;
 
 // @public (undocumented)
 export interface ContinueNode {
-  // (undocumented)
-  cache: {
-    key: string;
-  };
-  // (undocumented)
-  client: {
-    action: string;
-    collectors: Collectors[];
-    description?: string;
-    name?: string;
-    status: 'continue';
-  };
-  // (undocumented)
-  error: null;
-  // (undocumented)
-  httpStatus: number;
-  // (undocumented)
-  server: {
-    _links?: Links;
-    id?: string;
-    interactionId?: string;
-    interactionToken?: string;
-    href?: string;
-    eventName?: string;
+    // (undocumented)
+    cache: {
+        key: string;
+    };
+    // (undocumented)
+    client: {
+        action: string;
+        collectors: Collectors[];
+        description?: string;
+        name?: string;
+        status: 'continue';
+    };
+    // (undocumented)
+    error: null;
+    // (undocumented)
+    httpStatus: number;
+    // (undocumented)
+    server: {
+        _links?: Links;
+        id?: string;
+        interactionId?: string;
+        interactionToken?: string;
+        href?: string;
+        eventName?: string;
+        status: 'continue';
+    };
+    // (undocumented)
     status: 'continue';
-  };
-  // (undocumented)
-  status: 'continue';
 }
 
-export { CustomLogger };
+export { CustomLogger }
 
 // @public
 export type CustomPollingStatus = string & {};
 
 // @public
 export function davinci<ActionType extends ActionTypes = ActionTypes>(input: {
-  config: DaVinciConfig;
-  requestMiddleware?: RequestMiddleware<ActionType>[];
-  logger?: {
-    level: LogLevel;
-    custom?: CustomLogger;
-  };
+    config: DaVinciConfig;
+    requestMiddleware?: RequestMiddleware<ActionType>[];
+    logger?: {
+        level: LogLevel;
+        custom?: CustomLogger;
+    };
 }): Promise<{
-  subscribe: (listener: () => void) => Unsubscribe;
-  externalIdp: () => () => Promise<void | InternalErrorResponse>;
-  flow: (action: DaVinciAction) => InitFlow;
-  next: (args?: DaVinciRequest) => Promise<NodeStates>;
-  resume: (input: { continueToken: string }) => Promise<InternalErrorResponse | NodeStates>;
-  start: <QueryParams extends OutgoingQueryParams = OutgoingQueryParams>(
-    options?: StartOptions<QueryParams> | undefined,
-  ) => Promise<ContinueNode | ErrorNode | FailureNode | StartNode | SuccessNode>;
-  update: <
-    T extends SingleValueCollectors | MultiSelectCollector | ObjectValueCollectors | AutoCollectors,
-  >(
-    collector: T,
-  ) => Updater<T>;
-  validate: (
-    collector:
-      | SingleValueCollectors
-      | ObjectValueCollectors
-      | MultiValueCollectors
-      | AutoCollectors,
-  ) => Validator;
-  pollStatus: (collector: PollingCollector) => Poller;
-  getClient: () =>
-    | {
+    subscribe: (listener: () => void) => Unsubscribe;
+    externalIdp: () => (() => Promise<void | InternalErrorResponse>);
+    flow: (action: DaVinciAction) => InitFlow;
+    next: (args?: DaVinciRequest) => Promise<NodeStates>;
+    resume: (input: {
+        continueToken: string;
+    }) => Promise<InternalErrorResponse | NodeStates>;
+    start: <QueryParams extends OutgoingQueryParams = OutgoingQueryParams>(options?: StartOptions<QueryParams> | undefined) => Promise<ContinueNode | ErrorNode | FailureNode | StartNode | SuccessNode>;
+    update: <T extends SingleValueCollectors | MultiSelectCollector | ObjectValueCollectors | AutoCollectors>(collector: T) => Updater<T>;
+    validate: (collector: SingleValueCollectors | ObjectValueCollectors | MultiValueCollectors | AutoCollectors) => Validator;
+    poll: (collector: PollingCollector) => Poller;
+    getClient: () => {
         action: string;
         collectors: Collectors[];
         description?: string;
         name?: string;
-        status: 'continue';
-      }
-    | {
+        status: "continue";
+    } | {
         action: string;
         collectors: Collectors[];
         description?: string;
         name?: string;
-        status: 'error';
-      }
-    | {
-        status: 'failure';
-      }
-    | {
-        status: 'start';
-      }
-    | {
+        status: "error";
+    } | {
+        status: "failure";
+    } | {
+        status: "start";
+    } | {
         authorization?: {
-          code?: string;
-          state?: string;
+            code?: string;
+            state?: string;
         };
-        status: 'success';
-      }
-    | null;
-  getCollectors: () => Collectors[];
-  getError: () => DaVinciError | null;
-  getErrorCollectors: () => CollectorErrors[];
-  getNode: () => ContinueNode | ErrorNode | FailureNode | StartNode | SuccessNode;
-  getServer: () =>
-    | {
+        status: "success";
+    } | null;
+    getCollectors: () => Collectors[];
+    getError: () => DaVinciError | null;
+    getErrorCollectors: () => CollectorErrors[];
+    getNode: () => ContinueNode | ErrorNode | FailureNode | StartNode | SuccessNode;
+    getServer: () => {
         _links?: Links;
         id?: string;
         interactionId?: string;
         interactionToken?: string;
         href?: string;
         eventName?: string;
-        status: 'continue';
-      }
-    | {
+        status: "continue";
+    } | {
         _links?: Links;
         eventName?: string;
         id?: string;
         interactionId?: string;
         interactionToken?: string;
-        status: 'error';
-      }
-    | {
+        status: "error";
+    } | {
         _links?: Links;
         eventName?: string;
         href?: string;
         id?: string;
         interactionId?: string;
         interactionToken?: string;
-        status: 'failure';
-      }
-    | {
-        status: 'start';
-      }
-    | {
+        status: "failure";
+    } | {
+        status: "start";
+    } | {
         _links?: Links;
         eventName?: string;
         id?: string;
@@ -452,431 +331,240 @@ export function davinci<ActionType extends ActionTypes = ActionTypes>(input: {
         interactionToken?: string;
         href?: string;
         session?: string;
-        status: 'success';
-      }
-    | null;
-  cache: {
-    getLatestResponse: () =>
-      | ((
-          state: RootState<
-            {
-              flow: MutationDefinition<
-                any,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                any
-              >;
-              next: MutationDefinition<
-                any,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                any
-              >;
-              start: MutationDefinition<
-                StartOptions<OutgoingQueryParams> | undefined,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-              resume: QueryDefinition<
-                {
-                  serverInfo: ContinueNode['server'];
-                  continueToken: string;
-                },
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-              poll: MutationDefinition<
-                {
-                  endpoint: string;
-                  interactionId: string;
-                },
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-            },
-            never,
-            'davinci'
-          >,
-        ) =>
-          | ({
-              requestId?: undefined;
-              status: QueryStatus.uninitialized;
-              data?: undefined;
-              error?: undefined;
-              endpointName?: string;
-              startedTimeStamp?: undefined;
-              fulfilledTimeStamp?: undefined;
-            } & {
-              status: QueryStatus.uninitialized;
-              isUninitialized: true;
-              isLoading: false;
-              isSuccess: false;
-              isError: false;
-            })
-          | ({
-              status: QueryStatus.fulfilled;
-            } & Omit<
-              {
-                requestId: string;
-                data?: unknown;
-                error?: FetchBaseQueryError | SerializedError | undefined;
-                endpointName: string;
-                startedTimeStamp: number;
-                fulfilledTimeStamp?: number;
-              },
-              'data' | 'fulfilledTimeStamp'
-            > &
-              Required<
-                Pick<
-                  {
-                    requestId: string;
-                    data?: unknown;
-                    error?: FetchBaseQueryError | SerializedError | undefined;
-                    endpointName: string;
-                    startedTimeStamp: number;
-                    fulfilledTimeStamp?: number;
-                  },
-                  'data' | 'fulfilledTimeStamp'
-                >
-              > & {
-                error: undefined;
-              } & {
-                status: QueryStatus.fulfilled;
-                isUninitialized: false;
-                isLoading: false;
-                isSuccess: true;
-                isError: false;
-              })
-          | ({
-              status: QueryStatus.pending;
-            } & {
-              requestId: string;
-              data?: unknown;
-              error?: FetchBaseQueryError | SerializedError | undefined;
-              endpointName: string;
-              startedTimeStamp: number;
-              fulfilledTimeStamp?: number;
-            } & {
-              data?: undefined;
-            } & {
-              status: QueryStatus.pending;
-              isUninitialized: false;
-              isLoading: true;
-              isSuccess: false;
-              isError: false;
-            })
-          | ({
-              status: QueryStatus.rejected;
-            } & Omit<
-              {
-                requestId: string;
-                data?: unknown;
-                error?: FetchBaseQueryError | SerializedError | undefined;
-                endpointName: string;
-                startedTimeStamp: number;
-                fulfilledTimeStamp?: number;
-              },
-              'error'
-            > &
-              Required<
-                Pick<
-                  {
-                    requestId: string;
-                    data?: unknown;
-                    error?: FetchBaseQueryError | SerializedError | undefined;
-                    endpointName: string;
-                    startedTimeStamp: number;
-                    fulfilledTimeStamp?: number;
-                  },
-                  'error'
-                >
-              > & {
-                status: QueryStatus.rejected;
-                isUninitialized: false;
-                isLoading: false;
-                isSuccess: false;
-                isError: true;
-              }))
-      | {
-          error: {
-            message: string;
-            type: string;
-          };
+        status: "success";
+    } | null;
+    cache: {
+        getLatestResponse: () => ((state: RootState<    {
+        flow: MutationDefinition<any, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", any>;
+        next: MutationDefinition<any, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", any>;
+        start: MutationDefinition<StartOptions<OutgoingQueryParams> | undefined, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        resume: QueryDefinition<    {
+        serverInfo: ContinueNode["server"];
+        continueToken: string;
+        }, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        poll: MutationDefinition<    {
+        endpoint: string;
+        interactionId: string;
+        }, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        }, never, "davinci">) => ({
+            requestId?: undefined;
+            status: QueryStatus.uninitialized;
+            data?: undefined;
+            error?: undefined;
+            endpointName?: string;
+            startedTimeStamp?: undefined;
+            fulfilledTimeStamp?: undefined;
+        } & {
+            status: QueryStatus.uninitialized;
+            isUninitialized: true;
+            isLoading: false;
+            isSuccess: false;
+            isError: false;
+        }) | ({
+            status: QueryStatus.fulfilled;
+        } & Omit<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "data" | "fulfilledTimeStamp"> & Required<Pick<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "data" | "fulfilledTimeStamp">> & {
+            error: undefined;
+        } & {
+            status: QueryStatus.fulfilled;
+            isUninitialized: false;
+            isLoading: false;
+            isSuccess: true;
+            isError: false;
+        }) | ({
+            status: QueryStatus.pending;
+        } & {
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        } & {
+            data?: undefined;
+        } & {
+            status: QueryStatus.pending;
+            isUninitialized: false;
+            isLoading: true;
+            isSuccess: false;
+            isError: false;
+        }) | ({
+            status: QueryStatus.rejected;
+        } & Omit<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "error"> & Required<Pick<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "error">> & {
+            status: QueryStatus.rejected;
+            isUninitialized: false;
+            isLoading: false;
+            isSuccess: false;
+            isError: true;
+        })) | {
+            error: {
+                message: string;
+                type: string;
+            };
         };
-    getResponseWithId: (requestId: string) =>
-      | ((
-          state: RootState<
-            {
-              flow: MutationDefinition<
-                any,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                any
-              >;
-              next: MutationDefinition<
-                any,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                any
-              >;
-              start: MutationDefinition<
-                StartOptions<OutgoingQueryParams> | undefined,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-              resume: QueryDefinition<
-                {
-                  serverInfo: ContinueNode['server'];
-                  continueToken: string;
-                },
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-              poll: MutationDefinition<
-                {
-                  endpoint: string;
-                  interactionId: string;
-                },
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-            },
-            never,
-            'davinci'
-          >,
-        ) =>
-          | ({
-              requestId?: undefined;
-              status: QueryStatus.uninitialized;
-              data?: undefined;
-              error?: undefined;
-              endpointName?: string;
-              startedTimeStamp?: undefined;
-              fulfilledTimeStamp?: undefined;
-            } & {
-              status: QueryStatus.uninitialized;
-              isUninitialized: true;
-              isLoading: false;
-              isSuccess: false;
-              isError: false;
-            })
-          | ({
-              status: QueryStatus.fulfilled;
-            } & Omit<
-              {
-                requestId: string;
-                data?: unknown;
-                error?: FetchBaseQueryError | SerializedError | undefined;
-                endpointName: string;
-                startedTimeStamp: number;
-                fulfilledTimeStamp?: number;
-              },
-              'data' | 'fulfilledTimeStamp'
-            > &
-              Required<
-                Pick<
-                  {
-                    requestId: string;
-                    data?: unknown;
-                    error?: FetchBaseQueryError | SerializedError | undefined;
-                    endpointName: string;
-                    startedTimeStamp: number;
-                    fulfilledTimeStamp?: number;
-                  },
-                  'data' | 'fulfilledTimeStamp'
-                >
-              > & {
-                error: undefined;
-              } & {
-                status: QueryStatus.fulfilled;
-                isUninitialized: false;
-                isLoading: false;
-                isSuccess: true;
-                isError: false;
-              })
-          | ({
-              status: QueryStatus.pending;
-            } & {
-              requestId: string;
-              data?: unknown;
-              error?: FetchBaseQueryError | SerializedError | undefined;
-              endpointName: string;
-              startedTimeStamp: number;
-              fulfilledTimeStamp?: number;
-            } & {
-              data?: undefined;
-            } & {
-              status: QueryStatus.pending;
-              isUninitialized: false;
-              isLoading: true;
-              isSuccess: false;
-              isError: false;
-            })
-          | ({
-              status: QueryStatus.rejected;
-            } & Omit<
-              {
-                requestId: string;
-                data?: unknown;
-                error?: FetchBaseQueryError | SerializedError | undefined;
-                endpointName: string;
-                startedTimeStamp: number;
-                fulfilledTimeStamp?: number;
-              },
-              'error'
-            > &
-              Required<
-                Pick<
-                  {
-                    requestId: string;
-                    data?: unknown;
-                    error?: FetchBaseQueryError | SerializedError | undefined;
-                    endpointName: string;
-                    startedTimeStamp: number;
-                    fulfilledTimeStamp?: number;
-                  },
-                  'error'
-                >
-              > & {
-                status: QueryStatus.rejected;
-                isUninitialized: false;
-                isLoading: false;
-                isSuccess: false;
-                isError: true;
-              }))
-      | {
-          error: {
-            message: string;
-            type: string;
-          };
+        getResponseWithId: (requestId: string) => ((state: RootState<    {
+        flow: MutationDefinition<any, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", any>;
+        next: MutationDefinition<any, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", any>;
+        start: MutationDefinition<StartOptions<OutgoingQueryParams> | undefined, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        resume: QueryDefinition<    {
+        serverInfo: ContinueNode["server"];
+        continueToken: string;
+        }, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        poll: MutationDefinition<    {
+        endpoint: string;
+        interactionId: string;
+        }, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        }, never, "davinci">) => ({
+            requestId?: undefined;
+            status: QueryStatus.uninitialized;
+            data?: undefined;
+            error?: undefined;
+            endpointName?: string;
+            startedTimeStamp?: undefined;
+            fulfilledTimeStamp?: undefined;
+        } & {
+            status: QueryStatus.uninitialized;
+            isUninitialized: true;
+            isLoading: false;
+            isSuccess: false;
+            isError: false;
+        }) | ({
+            status: QueryStatus.fulfilled;
+        } & Omit<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "data" | "fulfilledTimeStamp"> & Required<Pick<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "data" | "fulfilledTimeStamp">> & {
+            error: undefined;
+        } & {
+            status: QueryStatus.fulfilled;
+            isUninitialized: false;
+            isLoading: false;
+            isSuccess: true;
+            isError: false;
+        }) | ({
+            status: QueryStatus.pending;
+        } & {
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        } & {
+            data?: undefined;
+        } & {
+            status: QueryStatus.pending;
+            isUninitialized: false;
+            isLoading: true;
+            isSuccess: false;
+            isError: false;
+        }) | ({
+            status: QueryStatus.rejected;
+        } & Omit<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "error"> & Required<Pick<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "error">> & {
+            status: QueryStatus.rejected;
+            isUninitialized: false;
+            isLoading: false;
+            isSuccess: false;
+            isError: true;
+        })) | {
+            error: {
+                message: string;
+                type: string;
+            };
         };
-  };
+    };
 }>;
 
 // @public
 export interface DaVinciAction {
-  // (undocumented)
-  action: string;
+    // (undocumented)
+    action: string;
 }
 
 // @public
 export interface DaVinciBaseResponse {
-  // (undocumented)
-  capabilityName?: string;
-  // (undocumented)
-  companyId?: string;
-  // (undocumented)
-  connectionId?: string;
-  // (undocumented)
-  connectorId?: string;
-  // (undocumented)
-  id?: string;
-  // (undocumented)
-  interactionId?: string;
-  // (undocumented)
-  interactionToken?: string;
-  // (undocumented)
-  isResponseCompatibleWithMobileAndWebSdks?: boolean;
-  // (undocumented)
-  status?: string;
+    // (undocumented)
+    capabilityName?: string;
+    // (undocumented)
+    companyId?: string;
+    // (undocumented)
+    connectionId?: string;
+    // (undocumented)
+    connectorId?: string;
+    // (undocumented)
+    id?: string;
+    // (undocumented)
+    interactionId?: string;
+    // (undocumented)
+    interactionToken?: string;
+    // (undocumented)
+    isResponseCompatibleWithMobileAndWebSdks?: boolean;
+    // (undocumented)
+    status?: string;
 }
 
 // @public
 export type DaVinciCacheEntry = {
-  data?: DaVinciBaseResponse;
-  error?: {
-    data: DaVinciBaseResponse;
-    status: number;
-  };
+    data?: DaVinciBaseResponse;
+    error?: {
+        data: DaVinciBaseResponse;
+        status: number;
+    };
 } & {
-  data?: any;
-  error?: any;
+    data?: any;
+    error?: any;
 } & MutationResultSelectorResult<any>;
 
 // @public (undocumented)
@@ -884,470 +572,439 @@ export type DavinciClient = Awaited<ReturnType<typeof davinci>>;
 
 // @public (undocumented)
 export interface DaVinciConfig extends AsyncLegacyConfigOptions {
-  // (undocumented)
-  responseType?: string;
+    // (undocumented)
+    responseType?: string;
 }
 
 // @public (undocumented)
 export interface DaVinciError extends Omit<GenericError, 'error'> {
-  // (undocumented)
-  collectors?: CollectorErrors[];
-  // (undocumented)
-  internalHttpStatus?: number;
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  status: 'error' | 'failure' | 'unknown';
+    // (undocumented)
+    collectors?: CollectorErrors[];
+    // (undocumented)
+    internalHttpStatus?: number;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    status: 'error' | 'failure' | 'unknown';
 }
 
 // @public (undocumented)
 export interface DaVinciErrorCacheEntry<T> {
-  // (undocumented)
-  endpointName: 'next' | 'flow' | 'start';
-  // (undocumented)
-  error: {
-    data: T;
-  };
-  // (undocumented)
-  fulfilledTimeStamp: number;
-  // (undocumented)
-  isError: boolean;
-  // (undocumented)
-  isLoading: boolean;
-  // (undocumented)
-  isSuccess: boolean;
-  // (undocumented)
-  isUninitialized: boolean;
-  // (undocumented)
-  requestId: string;
-  // (undocumented)
-  startedTimeStamp: number;
-  // (undocumented)
-  status: 'fulfilled' | 'pending' | 'rejected';
+    // (undocumented)
+    endpointName: 'next' | 'flow' | 'start';
+    // (undocumented)
+    error: {
+        data: T;
+    };
+    // (undocumented)
+    fulfilledTimeStamp: number;
+    // (undocumented)
+    isError: boolean;
+    // (undocumented)
+    isLoading: boolean;
+    // (undocumented)
+    isSuccess: boolean;
+    // (undocumented)
+    isUninitialized: boolean;
+    // (undocumented)
+    requestId: string;
+    // (undocumented)
+    startedTimeStamp: number;
+    // (undocumented)
+    status: 'fulfilled' | 'pending' | 'rejected';
 }
 
 // @public (undocumented)
 export interface DavinciErrorResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  cause?: string | null;
-  // (undocumented)
-  code: string | number;
-  // (undocumented)
-  details?: ErrorDetail[];
-  // (undocumented)
-  doNotSendToOE?: boolean;
-  // (undocumented)
-  error?: {
-    code?: string;
-    message?: string;
-  };
-  // (undocumented)
-  errorCategory?: string;
-  // (undocumented)
-  errorMessage?: string;
-  // (undocumented)
-  expected?: boolean;
-  // (undocumented)
-  httpResponseCode: number;
-  // (undocumented)
-  isErrorCustomized?: boolean;
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  metricAttributes?: {
-    [key: string]: unknown;
-  };
+    // (undocumented)
+    cause?: string | null;
+    // (undocumented)
+    code: string | number;
+    // (undocumented)
+    details?: ErrorDetail[];
+    // (undocumented)
+    doNotSendToOE?: boolean;
+    // (undocumented)
+    error?: {
+        code?: string;
+        message?: string;
+    };
+    // (undocumented)
+    errorCategory?: string;
+    // (undocumented)
+    errorMessage?: string;
+    // (undocumented)
+    expected?: boolean;
+    // (undocumented)
+    httpResponseCode: number;
+    // (undocumented)
+    isErrorCustomized?: boolean;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    metricAttributes?: {
+        [key: string]: unknown;
+    };
 }
 
 // @public (undocumented)
 export interface DaVinciFailureResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  error?: {
-    code?: string;
-    message?: string;
-    [key: string]: unknown;
-  };
+    // (undocumented)
+    error?: {
+        code?: string;
+        message?: string;
+        [key: string]: unknown;
+    };
 }
 
 // @public (undocumented)
-export type DaVinciField =
-  | ComplexValueFields
-  | MultiValueFields
-  | ReadOnlyFields
-  | RedirectFields
-  | SingleValueFields;
+export type DaVinciField = ComplexValueFields | MultiValueFields | ReadOnlyFields | RedirectFields | SingleValueFields;
 
 // @public
 export interface DaVinciNextResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  eventName?: string;
-  // (undocumented)
-  form?: {
-    name?: string;
-    description?: string;
-    components?: {
-      fields?: DaVinciField[];
+    // (undocumented)
+    eventName?: string;
+    // (undocumented)
+    form?: {
+        name?: string;
+        description?: string;
+        components?: {
+            fields?: DaVinciField[];
+        };
     };
-  };
-  // (undocumented)
-  formData?: {
-    value?: {
-      [key: string]: string;
+    // (undocumented)
+    formData?: {
+        value?: {
+            [key: string]: string;
+        };
     };
-  };
-  // (undocumented)
-  _links?: Links;
+    // (undocumented)
+    _links?: Links;
 }
 
 // @public
 export interface DaVinciPollResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  eventName?: string;
-  // (undocumented)
-  _links?: Links;
-  // (undocumented)
-  success?: boolean;
+    // (undocumented)
+    eventName?: string;
+    // (undocumented)
+    _links?: Links;
+    // (undocumented)
+    success?: boolean;
 }
 
 // @public (undocumented)
 export interface DaVinciRequest {
-  // (undocumented)
-  eventName: string;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  interactionId: string;
-  // (undocumented)
-  parameters: {
-    eventType: 'submit' | 'action' | 'polling';
-    data: {
-      actionKey: string;
-      formData?: Record<string, unknown>;
+    // (undocumented)
+    eventName: string;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    interactionId: string;
+    // (undocumented)
+    parameters: {
+        eventType: 'submit' | 'action' | 'polling';
+        data: {
+            actionKey: string;
+            formData?: Record<string, unknown>;
+        };
     };
-  };
 }
 
 // @public (undocumented)
 export interface DaVinciSuccessResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  authorizeResponse?: OAuthDetails;
-  // (undocumented)
-  environment: {
-    id: string;
-    [key: string]: unknown;
-  };
-  // (undocumented)
-  _links?: Links;
-  // (undocumented)
-  resetCookie?: boolean;
-  // (undocumented)
-  session?: {
-    id?: string;
-    [key: string]: unknown;
-  };
-  // (undocumented)
-  sessionToken?: string;
-  // (undocumented)
-  sessionTokenMaxAge?: number;
-  // (undocumented)
-  status: string;
-  // (undocumented)
-  subFlowSettings?: {
-    cssLinks?: unknown[];
-    cssUrl?: unknown;
-    jsLinks?: unknown[];
-    loadingScreenSettings?: unknown;
-    reactSkUrl?: unknown;
-  };
-  // (undocumented)
-  success: true;
+    // (undocumented)
+    authorizeResponse?: OAuthDetails;
+    // (undocumented)
+    environment: {
+        id: string;
+        [key: string]: unknown;
+    };
+    // (undocumented)
+    _links?: Links;
+    // (undocumented)
+    resetCookie?: boolean;
+    // (undocumented)
+    session?: {
+        id?: string;
+        [key: string]: unknown;
+    };
+    // (undocumented)
+    sessionToken?: string;
+    // (undocumented)
+    sessionTokenMaxAge?: number;
+    // (undocumented)
+    status: string;
+    // (undocumented)
+    subFlowSettings?: {
+        cssLinks?: unknown[];
+        cssUrl?: unknown;
+        jsLinks?: unknown[];
+        loadingScreenSettings?: unknown;
+        reactSkUrl?: unknown;
+    };
+    // (undocumented)
+    success: true;
 }
 
 // @public (undocumented)
-export type DeviceAuthenticationCollector = ObjectOptionsCollectorWithObjectValue<
-  'DeviceAuthenticationCollector',
-  DeviceValue
->;
+export type DeviceAuthenticationCollector = ObjectOptionsCollectorWithObjectValue<'DeviceAuthenticationCollector', DeviceValue>;
 
 // @public (undocumented)
 export type DeviceAuthenticationField = {
-  type: 'DEVICE_AUTHENTICATION';
-  key: string;
-  label: string;
-  options: {
-    type: string;
-    iconSrc: string;
-    title: string;
-    id: string;
-    default: boolean;
-    description: string;
-  }[];
-  required: boolean;
+    type: 'DEVICE_AUTHENTICATION';
+    key: string;
+    label: string;
+    options: {
+        type: string;
+        iconSrc: string;
+        title: string;
+        id: string;
+        default: boolean;
+        description: string;
+    }[];
+    required: boolean;
 };
 
 // @public (undocumented)
 export interface DeviceOptionNoDefault {
-  // (undocumented)
-  content: string;
-  // (undocumented)
-  key: string;
-  // (undocumented)
-  label: string;
-  // (undocumented)
-  type: string;
-  // (undocumented)
-  value: string;
+    // (undocumented)
+    content: string;
+    // (undocumented)
+    key: string;
+    // (undocumented)
+    label: string;
+    // (undocumented)
+    type: string;
+    // (undocumented)
+    value: string;
 }
 
 // @public (undocumented)
 export interface DeviceOptionWithDefault {
-  // (undocumented)
-  content: string;
-  // (undocumented)
-  default: boolean;
-  // (undocumented)
-  key: string;
-  // (undocumented)
-  label: string;
-  // (undocumented)
-  type: string;
-  // (undocumented)
-  value: string;
+    // (undocumented)
+    content: string;
+    // (undocumented)
+    default: boolean;
+    // (undocumented)
+    key: string;
+    // (undocumented)
+    label: string;
+    // (undocumented)
+    type: string;
+    // (undocumented)
+    value: string;
 }
 
 // @public (undocumented)
-export type DeviceRegistrationCollector = ObjectOptionsCollectorWithStringValue<
-  'DeviceRegistrationCollector',
-  string
->;
+export type DeviceRegistrationCollector = ObjectOptionsCollectorWithStringValue<'DeviceRegistrationCollector', string>;
 
 // @public (undocumented)
 export type DeviceRegistrationField = {
-  type: 'DEVICE_REGISTRATION';
-  key: string;
-  label: string;
-  options: {
-    type: string;
-    iconSrc: string;
-    title: string;
-    description: string;
-  }[];
-  required: boolean;
+    type: 'DEVICE_REGISTRATION';
+    key: string;
+    label: string;
+    options: {
+        type: string;
+        iconSrc: string;
+        title: string;
+        description: string;
+    }[];
+    required: boolean;
 };
 
 // @public (undocumented)
 export interface DeviceValue {
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  type: string;
-  // (undocumented)
-  value: string;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    type: string;
+    // (undocumented)
+    value: string;
 }
 
 // @public (undocumented)
 export interface ErrorDetail {
-  // (undocumented)
-  message?: string;
-  // (undocumented)
-  rawResponse?: {
-    _embedded?: {
-      users?: Array<unknown>;
-    };
-    code?: string;
-    count?: number;
-    details?: NestedErrorDetails[];
-    id?: string;
+    // (undocumented)
     message?: string;
-    size?: number;
-    userFilter?: string;
-    [key: string]: unknown;
-  };
-  // (undocumented)
-  statusCode?: number;
+    // (undocumented)
+    rawResponse?: {
+        _embedded?: {
+            users?: Array<unknown>;
+        };
+        code?: string;
+        count?: number;
+        details?: NestedErrorDetails[];
+        id?: string;
+        message?: string;
+        size?: number;
+        userFilter?: string;
+        [key: string]: unknown;
+    };
+    // (undocumented)
+    statusCode?: number;
 }
 
 // @public (undocumented)
 export interface ErrorNode {
-  // (undocumented)
-  cache: {
-    key: string;
-  };
-  // (undocumented)
-  client: {
-    action: string;
-    collectors: Collectors[];
-    description?: string;
-    name?: string;
-    status: 'error';
-  };
-  // (undocumented)
-  error: DaVinciError;
-  // (undocumented)
-  httpStatus: number;
-  // (undocumented)
-  server: {
-    _links?: Links;
-    eventName?: string;
-    id?: string;
-    interactionId?: string;
-    interactionToken?: string;
+    // (undocumented)
+    cache: {
+        key: string;
+    };
+    // (undocumented)
+    client: {
+        action: string;
+        collectors: Collectors[];
+        description?: string;
+        name?: string;
+        status: 'error';
+    };
+    // (undocumented)
+    error: DaVinciError;
+    // (undocumented)
+    httpStatus: number;
+    // (undocumented)
+    server: {
+        _links?: Links;
+        eventName?: string;
+        id?: string;
+        interactionId?: string;
+        interactionToken?: string;
+        status: 'error';
+    } | null;
+    // (undocumented)
     status: 'error';
-  } | null;
-  // (undocumented)
-  status: 'error';
 }
 
 // @public (undocumented)
 export interface FailureNode {
-  // (undocumented)
-  cache: {
-    key: string;
-  };
-  // (undocumented)
-  client: {
-    status: 'failure';
-  };
-  // (undocumented)
-  error: DaVinciError;
-  // (undocumented)
-  httpStatus: number;
-  // (undocumented)
-  server: {
-    _links?: Links;
-    eventName?: string;
-    href?: string;
-    id?: string;
-    interactionId?: string;
-    interactionToken?: string;
+    // (undocumented)
+    cache: {
+        key: string;
+    };
+    // (undocumented)
+    client: {
+        status: 'failure';
+    };
+    // (undocumented)
+    error: DaVinciError;
+    // (undocumented)
+    httpStatus: number;
+    // (undocumented)
+    server: {
+        _links?: Links;
+        eventName?: string;
+        href?: string;
+        id?: string;
+        interactionId?: string;
+        interactionToken?: string;
+        status: 'failure';
+    } | null;
+    // (undocumented)
     status: 'failure';
-  } | null;
-  // (undocumented)
-  status: 'failure';
 }
 
 // @public
 export function fido(): FidoClient;
 
 // @public (undocumented)
-export type FidoAuthenticationCollector = AutoCollector<
-  'ObjectValueAutoCollector',
-  'FidoAuthenticationCollector',
-  FidoAuthenticationInputValue,
-  FidoAuthenticationOutputValue
->;
+export type FidoAuthenticationCollector = AutoCollector<'ObjectValueAutoCollector', 'FidoAuthenticationCollector', FidoAuthenticationInputValue, FidoAuthenticationOutputValue>;
 
 // @public (undocumented)
 export type FidoAuthenticationField = {
-  type: 'FIDO2';
-  key: string;
-  label: string;
-  publicKeyCredentialRequestOptions: FidoAuthenticationOptions;
-  action: 'AUTHENTICATE';
-  trigger: string;
-  required: boolean;
+    type: 'FIDO2';
+    key: string;
+    label: string;
+    publicKeyCredentialRequestOptions: FidoAuthenticationOptions;
+    action: 'AUTHENTICATE';
+    trigger: string;
+    required: boolean;
 };
 
 // @public (undocumented)
 export interface FidoAuthenticationInputValue {
-  // (undocumented)
-  assertionValue?: AssertionValue;
+    // (undocumented)
+    assertionValue?: AssertionValue;
 }
 
 // @public (undocumented)
-export interface FidoAuthenticationOptions extends Omit<
-  PublicKeyCredentialRequestOptions,
-  'challenge' | 'allowCredentials'
-> {
-  // (undocumented)
-  allowCredentials?: {
-    id: number[];
-    transports?: AuthenticatorTransport[];
-    type: PublicKeyCredentialType;
-  }[];
-  // (undocumented)
-  challenge: number[];
+export interface FidoAuthenticationOptions extends Omit<PublicKeyCredentialRequestOptions, 'challenge' | 'allowCredentials'> {
+    // (undocumented)
+    allowCredentials?: {
+        id: number[];
+        transports?: AuthenticatorTransport[];
+        type: PublicKeyCredentialType;
+    }[];
+    // (undocumented)
+    challenge: number[];
 }
 
 // @public (undocumented)
 export interface FidoAuthenticationOutputValue {
-  // (undocumented)
-  action: 'AUTHENTICATE';
-  // (undocumented)
-  publicKeyCredentialRequestOptions: FidoAuthenticationOptions;
-  // (undocumented)
-  trigger: string;
+    // (undocumented)
+    action: 'AUTHENTICATE';
+    // (undocumented)
+    publicKeyCredentialRequestOptions: FidoAuthenticationOptions;
+    // (undocumented)
+    trigger: string;
 }
 
 // @public (undocumented)
 export interface FidoClient {
-  authenticate: (
-    options: FidoAuthenticationOptions,
-  ) => Promise<FidoAuthenticationInputValue | GenericError>;
-  register: (
-    options: FidoRegistrationOptions,
-  ) => Promise<FidoRegistrationInputValue | GenericError>;
+    authenticate: (options: FidoAuthenticationOptions) => Promise<FidoAuthenticationInputValue | GenericError>;
+    register: (options: FidoRegistrationOptions) => Promise<FidoRegistrationInputValue | GenericError>;
 }
 
 // @public (undocumented)
-export type FidoRegistrationCollector = AutoCollector<
-  'ObjectValueAutoCollector',
-  'FidoRegistrationCollector',
-  FidoRegistrationInputValue,
-  FidoRegistrationOutputValue
->;
+export type FidoRegistrationCollector = AutoCollector<'ObjectValueAutoCollector', 'FidoRegistrationCollector', FidoRegistrationInputValue, FidoRegistrationOutputValue>;
 
 // @public (undocumented)
 export type FidoRegistrationField = {
-  type: 'FIDO2';
-  key: string;
-  label: string;
-  publicKeyCredentialCreationOptions: FidoRegistrationOptions;
-  action: 'REGISTER';
-  trigger: string;
-  required: boolean;
+    type: 'FIDO2';
+    key: string;
+    label: string;
+    publicKeyCredentialCreationOptions: FidoRegistrationOptions;
+    action: 'REGISTER';
+    trigger: string;
+    required: boolean;
 };
 
 // @public (undocumented)
 export interface FidoRegistrationInputValue {
-  // (undocumented)
-  attestationValue?: AttestationValue;
-}
-
-// @public (undocumented)
-export interface FidoRegistrationOptions extends Omit<
-  PublicKeyCredentialCreationOptions,
-  'challenge' | 'user' | 'pubKeyCredParams' | 'excludeCredentials'
-> {
-  // (undocumented)
-  challenge: number[];
-  // (undocumented)
-  excludeCredentials?: {
-    id: number[];
-    transports?: AuthenticatorTransport[];
-    type: PublicKeyCredentialType;
-  }[];
-  // (undocumented)
-  pubKeyCredParams: {
-    alg: string | number;
-    type: PublicKeyCredentialType;
-  }[];
-  // (undocumented)
-  user: {
-    id: number[];
-    name: string;
-    displayName: string;
-  };
+    // (undocumented)
+    attestationValue?: AttestationValue;
+}
+
+// @public (undocumented)
+export interface FidoRegistrationOptions extends Omit<PublicKeyCredentialCreationOptions, 'challenge' | 'user' | 'pubKeyCredParams' | 'excludeCredentials'> {
+    // (undocumented)
+    challenge: number[];
+    // (undocumented)
+    excludeCredentials?: {
+        id: number[];
+        transports?: AuthenticatorTransport[];
+        type: PublicKeyCredentialType;
+    }[];
+    // (undocumented)
+    pubKeyCredParams: {
+        alg: string | number;
+        type: PublicKeyCredentialType;
+    }[];
+    // (undocumented)
+    user: {
+        id: number[];
+        name: string;
+        displayName: string;
+    };
 }
 
 // @public (undocumented)
 export interface FidoRegistrationOutputValue {
-  // (undocumented)
-  action: 'REGISTER';
-  // (undocumented)
-  publicKeyCredentialCreationOptions: FidoRegistrationOptions;
-  // (undocumented)
-  trigger: string;
+    // (undocumented)
+    action: 'REGISTER';
+    // (undocumented)
+    publicKeyCredentialCreationOptions: FidoRegistrationOptions;
+    // (undocumented)
+    trigger: string;
 }
 
 // @public (undocumented)
@@ -1357,195 +1014,132 @@ export type FlowCollector = ActionCollectorNoUrl<'FlowCollector'>;
 export type FlowNode = ContinueNode | ErrorNode | StartNode | SuccessNode | FailureNode;
 
 // @public
-export type GetClient =
-  | StartNode['client']
-  | ContinueNode['client']
-  | ErrorNode['client']
-  | SuccessNode['client']
-  | FailureNode['client'];
+export type GetClient = StartNode['client'] | ContinueNode['client'] | ErrorNode['client'] | SuccessNode['client'] | FailureNode['client'];
 
 // @public (undocumented)
 export type IdpCollector = ActionCollectorWithUrl<'IdpCollector'>;
 
 // @public (undocumented)
-export type InferActionCollectorType<T extends ActionCollectorTypes> = T extends 'IdpCollector'
-  ? IdpCollector
-  : T extends 'SubmitCollector'
-    ? SubmitCollector
-    : T extends 'FlowCollector'
-      ? FlowCollector
-      : ActionCollectorWithUrl<'ActionCollector'> | ActionCollectorNoUrl<'ActionCollector'>;
+export type InferActionCollectorType<T extends ActionCollectorTypes> = T extends 'IdpCollector' ? IdpCollector : T extends 'SubmitCollector' ? SubmitCollector : T extends 'FlowCollector' ? FlowCollector : ActionCollectorWithUrl<'ActionCollector'> | ActionCollectorNoUrl<'ActionCollector'>;
 
 // @public
-export type InferAutoCollectorType<T extends AutoCollectorTypes> = T extends 'ProtectCollector'
-  ? ProtectCollector
-  : T extends 'PollingCollector'
-    ? PollingCollector
-    : T extends 'FidoRegistrationCollector'
-      ? FidoRegistrationCollector
-      : T extends 'FidoAuthenticationCollector'
-        ? FidoAuthenticationCollector
-        : T extends 'ObjectValueAutoCollector'
-          ? ObjectValueAutoCollector
-          : SingleValueAutoCollector;
+export type InferAutoCollectorType<T extends AutoCollectorTypes> = T extends 'ProtectCollector' ? ProtectCollector : T extends 'PollingCollector' ? PollingCollector : T extends 'FidoRegistrationCollector' ? FidoRegistrationCollector : T extends 'FidoAuthenticationCollector' ? FidoAuthenticationCollector : T extends 'ObjectValueAutoCollector' ? ObjectValueAutoCollector : SingleValueAutoCollector;
 
 // @public
-export type InferMultiValueCollectorType<T extends MultiValueCollectorTypes> =
-  T extends 'MultiSelectCollector'
-    ? MultiValueCollectorWithValue<'MultiSelectCollector'>
-    :
-        | MultiValueCollectorWithValue<'MultiValueCollector'>
-        | MultiValueCollectorNoValue<'MultiValueCollector'>;
+export type InferMultiValueCollectorType<T extends MultiValueCollectorTypes> = T extends 'MultiSelectCollector' ? MultiValueCollectorWithValue<'MultiSelectCollector'> : MultiValueCollectorWithValue<'MultiValueCollector'> | MultiValueCollectorNoValue<'MultiValueCollector'>;
 
 // @public
-export type InferNoValueCollectorType<T extends NoValueCollectorTypes> =
-  T extends 'ReadOnlyCollector'
-    ? ReadOnlyCollector
-    : T extends 'RichTextCollector'
-      ? RichTextCollector
-      : T extends 'QrCodeCollector'
-        ? QrCodeCollector
-        : T extends 'AgreementCollector'
-          ? AgreementCollector
-          : NoValueCollectorBase<'NoValueCollector'>;
+export type InferNoValueCollectorType<T extends NoValueCollectorTypes> = T extends 'ReadOnlyCollector' ? NoValueCollectorBase<'ReadOnlyCollector'> : T extends 'QrCodeCollector' ? QrCodeCollectorBase : T extends 'AgreementCollector' ? AgreementCollector : NoValueCollectorBase<'NoValueCollector'>;
 
 // @public
-export type InferSingleValueCollectorType<T extends SingleValueCollectorTypes> =
-  T extends 'TextCollector'
-    ? TextCollector
-    : T extends 'SingleSelectCollector'
-      ? SingleSelectCollector
-      : T extends 'ValidatedTextCollector'
-        ? ValidatedTextCollector
-        : T extends 'PasswordCollector'
-          ? PasswordCollector
-          : T extends 'ValidatedPasswordCollector'
-            ? ValidatedPasswordCollector
-            :
-                | SingleValueCollectorWithValue<'SingleValueCollector'>
-                | SingleValueCollectorNoValue<'SingleValueCollector'>;
-
-// @public (undocumented)
-export type InferValueObjectCollectorType<T extends ObjectValueCollectorTypes> =
-  T extends 'DeviceAuthenticationCollector'
-    ? DeviceAuthenticationCollector
-    : T extends 'DeviceRegistrationCollector'
-      ? DeviceRegistrationCollector
-      : T extends 'PhoneNumberCollector'
-        ? PhoneNumberCollector
-        : T extends 'PhoneNumberExtensionCollector'
-          ? PhoneNumberExtensionCollector
-          :
-              | ObjectOptionsCollectorWithObjectValue<'ObjectValueCollector'>
-              | ObjectOptionsCollectorWithStringValue<'ObjectValueCollector'>;
+export type InferSingleValueCollectorType<T extends SingleValueCollectorTypes> = T extends 'TextCollector' ? TextCollector : T extends 'SingleSelectCollector' ? SingleSelectCollector : T extends 'ValidatedTextCollector' ? ValidatedTextCollector : T extends 'PasswordCollector' ? PasswordCollector : SingleValueCollectorWithValue<'SingleValueCollector'> | SingleValueCollectorNoValue<'SingleValueCollector'>;
+
+// @public (undocumented)
+export type InferValueObjectCollectorType<T extends ObjectValueCollectorTypes> = T extends 'DeviceAuthenticationCollector' ? DeviceAuthenticationCollector : T extends 'DeviceRegistrationCollector' ? DeviceRegistrationCollector : T extends 'PhoneNumberCollector' ? PhoneNumberCollector : ObjectOptionsCollectorWithObjectValue<'ObjectValueCollector'> | ObjectOptionsCollectorWithStringValue<'ObjectValueCollector'>;
 
 // @public (undocumented)
 export type InitFlow = () => Promise<FlowNode | InternalErrorResponse>;
 
 // @public (undocumented)
 export interface InternalErrorResponse {
-  // (undocumented)
-  error: Omit<GenericError, 'error'> & {
-    message: string;
-  };
-  // (undocumented)
-  type: 'internal_error';
+    // (undocumented)
+    error: Omit<GenericError, 'error'> & {
+        message: string;
+    };
+    // (undocumented)
+    type: 'internal_error';
 }
 
 // @public (undocumented)
 export interface Links {
-  // (undocumented)
-  [key: string]: {
-    href?: string;
-  };
+    // (undocumented)
+    [key: string]: {
+        href?: string;
+    };
 }
 
-export { LogLevel };
+export { LogLevel }
 
 // @public (undocumented)
 export type MultiSelectCollector = MultiValueCollectorWithValue<'MultiSelectCollector'>;
 
 // @public (undocumented)
 export type MultiSelectField = {
-  inputType: 'MULTI_SELECT';
-  key: string;
-  label: string;
-  options: {
+    inputType: 'MULTI_SELECT';
+    key: string;
     label: string;
-    value: string;
-  }[];
-  required?: boolean;
-  type: 'CHECKBOX' | 'COMBOBOX';
+    options: {
+        label: string;
+        value: string;
+    }[];
+    required?: boolean;
+    type: 'CHECKBOX' | 'COMBOBOX';
 };
 
 // @public (undocumented)
-export type MultiValueCollector<T extends MultiValueCollectorTypes> =
-  | MultiValueCollectorWithValue<T>
-  | MultiValueCollectorNoValue<T>;
+export type MultiValueCollector<T extends MultiValueCollectorTypes> = MultiValueCollectorWithValue<T> | MultiValueCollectorNoValue<T>;
 
 // @public (undocumented)
 export interface MultiValueCollectorNoValue<T extends MultiValueCollectorTypes> {
-  // (undocumented)
-  category: 'MultiValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string[];
-    type: string;
-    validation: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    options: SelectorOption[];
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'MultiValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string[];
+        type: string;
+        validation: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        options: SelectorOption[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type MultiValueCollectors =
-  | MultiValueCollectorWithValue<'MultiValueCollector'>
-  | MultiValueCollectorWithValue<'MultiSelectCollector'>;
+export type MultiValueCollectors = MultiValueCollectorWithValue<'MultiValueCollector'> | MultiValueCollectorWithValue<'MultiSelectCollector'>;
 
 // @public
 export type MultiValueCollectorTypes = 'MultiSelectCollector' | 'MultiValueCollector';
 
 // @public (undocumented)
 export interface MultiValueCollectorWithValue<T extends MultiValueCollectorTypes> {
-  // (undocumented)
-  category: 'MultiValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string[];
-    type: string;
-    validation: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value: string[];
-    options: SelectorOption[];
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'MultiValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string[];
+        type: string;
+        validation: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value: string[];
+        options: SelectorOption[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
@@ -1553,563 +1147,314 @@ export type MultiValueFields = MultiSelectField;
 
 // @public
 export interface NestedErrorDetails {
-  // (undocumented)
-  code?: string;
-  // (undocumented)
-  innerError?: {
-    history?: string;
-    unsatisfiedRequirements?: string[];
-    failuresRemaining?: number;
-  };
-  // (undocumented)
-  message?: string;
-  // (undocumented)
-  target?: string;
+    // (undocumented)
+    code?: string;
+    // (undocumented)
+    innerError?: {
+        history?: string;
+        unsatisfiedRequirements?: string[];
+        failuresRemaining?: number;
+    };
+    // (undocumented)
+    message?: string;
+    // (undocumented)
+    target?: string;
 }
 
 // @public
-export const nextCollectorValues: ActionCreatorWithPayload<
-  {
-    fields: DaVinciField[];
-    formData: {
-      value: Record<string, unknown>;
-    };
-  },
-  string
->;
+export const nextCollectorValues: ActionCreatorWithPayload<    {
+fields: DaVinciField[];
+formData: {
+value: Record<string, unknown>;
+};
+}, string>;
 
 // @public
-export const nodeCollectorReducer: Reducer<
-  (
-    | TextCollector
-    | SingleSelectCollector
-    | ValidatedTextCollector
-    | PasswordCollector
-    | ValidatedPasswordCollector
-    | MultiSelectCollector
-    | PhoneNumberExtensionCollector
-    | DeviceAuthenticationCollector
-    | DeviceRegistrationCollector
-    | PhoneNumberCollector
-    | IdpCollector
-    | SubmitCollector
-    | FlowCollector
-    | QrCodeCollector
-    | ReadOnlyCollector
-    | RichTextCollector
-    | AgreementCollector
-    | UnknownCollector
-    | ProtectCollector
-    | FidoRegistrationCollector
-    | FidoAuthenticationCollector
-    | PollingCollector
-    | ActionCollector<'ActionCollector'>
-    | SingleValueCollector<'SingleValueCollector'>
-  )[]
-> & {
-  getInitialState: () => (
-    | TextCollector
-    | SingleSelectCollector
-    | ValidatedTextCollector
-    | PasswordCollector
-    | ValidatedPasswordCollector
-    | MultiSelectCollector
-    | PhoneNumberExtensionCollector
-    | DeviceAuthenticationCollector
-    | DeviceRegistrationCollector
-    | PhoneNumberCollector
-    | IdpCollector
-    | SubmitCollector
-    | FlowCollector
-    | QrCodeCollector
-    | ReadOnlyCollector
-    | RichTextCollector
-    | AgreementCollector
-    | UnknownCollector
-    | ProtectCollector
-    | FidoRegistrationCollector
-    | FidoAuthenticationCollector
-    | PollingCollector
-    | ActionCollector<'ActionCollector'>
-    | SingleValueCollector<'SingleValueCollector'>
-  )[];
+export const nodeCollectorReducer: Reducer<(TextCollector | SingleSelectCollector | ValidatedTextCollector | PasswordCollector | MultiSelectCollector | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector | IdpCollector | SubmitCollector | FlowCollector | QrCodeCollectorBase | AgreementCollector | ReadOnlyCollector | UnknownCollector | ProtectCollector | FidoRegistrationCollector | FidoAuthenticationCollector | PollingCollector | ActionCollector<"ActionCollector"> | SingleValueCollector<"SingleValueCollector">)[]> & {
+    getInitialState: () => (TextCollector | SingleSelectCollector | ValidatedTextCollector | PasswordCollector | MultiSelectCollector | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector | IdpCollector | SubmitCollector | FlowCollector | QrCodeCollectorBase | AgreementCollector | ReadOnlyCollector | UnknownCollector | ProtectCollector | FidoRegistrationCollector | FidoAuthenticationCollector | PollingCollector | ActionCollector<"ActionCollector"> | SingleValueCollector<"SingleValueCollector">)[];
 };
 
 // @public (undocumented)
 export type NodeStates = StartNode | ContinueNode | ErrorNode | SuccessNode | FailureNode;
 
 // @public (undocumented)
-export type NoValueCollector<T extends NoValueCollectorTypes> = InferNoValueCollectorType<T>;
+export type NoValueCollector<T extends NoValueCollectorTypes> = NoValueCollectorBase<T>;
 
 // @public (undocumented)
 export interface NoValueCollectorBase<T extends NoValueCollectorTypes> {
-  // (undocumented)
-  category: 'NoValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'NoValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type NoValueCollectors =
-  | NoValueCollectorBase<'NoValueCollector'>
-  | ReadOnlyCollector
-  | RichTextCollector
-  | QrCodeCollector
-  | AgreementCollector;
+export type NoValueCollectors = NoValueCollectorBase<'NoValueCollector'> | NoValueCollectorBase<'ReadOnlyCollector'> | QrCodeCollectorBase | AgreementCollector;
 
 // @public
-export type NoValueCollectorTypes =
-  | 'ReadOnlyCollector'
-  | 'RichTextCollector'
-  | 'NoValueCollector'
-  | 'QrCodeCollector'
-  | 'AgreementCollector';
+export type NoValueCollectorTypes = 'ReadOnlyCollector' | 'NoValueCollector' | 'QrCodeCollector' | 'AgreementCollector';
 
 // @public
 export interface OAuthDetails {
-  // (undocumented)
-  [key: string]: unknown;
-  // (undocumented)
-  code?: string;
-  // (undocumented)
-  state?: string;
+    // (undocumented)
+    [key: string]: unknown;
+    // (undocumented)
+    code?: string;
+    // (undocumented)
+    state?: string;
 }
 
 // @public (undocumented)
-export interface ObjectOptionsCollectorWithObjectValue<
-  T extends ObjectValueCollectorTypes,
-  V = Record<string, string>,
-  D = Record<string, string>,
-> {
-  // (undocumented)
-  category: 'ObjectValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: V;
-    type: string;
-    validation: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    options: DeviceOptionWithDefault[];
-    value?: D | null;
-  };
-  // (undocumented)
-  type: T;
+export interface ObjectOptionsCollectorWithObjectValue<T extends ObjectValueCollectorTypes, V = Record<string, string>, D = Record<string, string>> {
+    // (undocumented)
+    category: 'ObjectValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: V;
+        type: string;
+        validation: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        options: DeviceOptionWithDefault[];
+        value?: D | null;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export interface ObjectOptionsCollectorWithStringValue<
-  T extends ObjectValueCollectorTypes,
-  V = string,
-> {
-  // (undocumented)
-  category: 'ObjectValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: V;
-    type: string;
-    validation: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    options: DeviceOptionNoDefault[];
-  };
-  // (undocumented)
-  type: T;
+export interface ObjectOptionsCollectorWithStringValue<T extends ObjectValueCollectorTypes, V = string> {
+    // (undocumented)
+    category: 'ObjectValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: V;
+        type: string;
+        validation: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        options: DeviceOptionNoDefault[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type ObjectValueAutoCollector = AutoCollector<
-  'ObjectValueAutoCollector',
-  'ObjectValueAutoCollector',
-  Record<string, unknown>
->;
+export type ObjectValueAutoCollector = AutoCollector<'ObjectValueAutoCollector', 'ObjectValueAutoCollector', Record<string, unknown>>;
 
 // @public (undocumented)
-export type ObjectValueAutoCollectorTypes =
-  | 'ObjectValueAutoCollector'
-  | 'FidoRegistrationCollector'
-  | 'FidoAuthenticationCollector';
+export type ObjectValueAutoCollectorTypes = 'ObjectValueAutoCollector' | 'FidoRegistrationCollector' | 'FidoAuthenticationCollector';
 
 // @public (undocumented)
-export type ObjectValueCollector<T extends ObjectValueCollectorTypes> =
-  | ObjectOptionsCollectorWithObjectValue<T>
-  | ObjectOptionsCollectorWithStringValue<T>
-  | ObjectValueCollectorWithObjectValue<T>;
+export type ObjectValueCollector<T extends ObjectValueCollectorTypes> = ObjectOptionsCollectorWithObjectValue<T> | ObjectOptionsCollectorWithStringValue<T> | ObjectValueCollectorWithObjectValue<T>;
 
 // @public (undocumented)
-export type ObjectValueCollectors =
-  | DeviceAuthenticationCollector
-  | DeviceRegistrationCollector
-  | PhoneNumberCollector
-  | PhoneNumberExtensionCollector
-  | ObjectOptionsCollectorWithObjectValue<'ObjectSelectCollector'>
-  | ObjectOptionsCollectorWithStringValue<'ObjectSelectCollector'>;
+export type ObjectValueCollectors = DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector | ObjectOptionsCollectorWithObjectValue<'ObjectSelectCollector'> | ObjectOptionsCollectorWithStringValue<'ObjectSelectCollector'>;
 
 // @public
-export type ObjectValueCollectorTypes =
-  | 'DeviceAuthenticationCollector'
-  | 'DeviceRegistrationCollector'
-  | 'PhoneNumberCollector'
-  | 'PhoneNumberExtensionCollector'
-  | 'ObjectOptionsCollector'
-  | 'ObjectValueCollector'
-  | 'ObjectSelectCollector';
-
-// @public (undocumented)
-export interface ObjectValueCollectorWithObjectValue<
-  T extends ObjectValueCollectorTypes,
-  IV = Record<string, string>,
-  OV = Record<string, string>,
-> {
-  // (undocumented)
-  category: 'ObjectValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: IV;
-    type: string;
-    validation: (ValidationRequired | ValidationPhoneNumber)[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value?: OV | null;
-  };
-  // (undocumented)
-  type: T;
-}
+export type ObjectValueCollectorTypes = 'DeviceAuthenticationCollector' | 'DeviceRegistrationCollector' | 'PhoneNumberCollector' | 'ObjectOptionsCollector' | 'ObjectValueCollector' | 'ObjectSelectCollector';
 
 // @public (undocumented)
-export interface OutgoingQueryParams {
-  // (undocumented)
-  [key: string]: string | string[];
+export interface ObjectValueCollectorWithObjectValue<T extends ObjectValueCollectorTypes, IV = Record<string, string>, OV = Record<string, string>> {
+    // (undocumented)
+    category: 'ObjectValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: IV;
+        type: string;
+        validation: (ValidationRequired | ValidationPhoneNumber)[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value?: OV | null;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export interface PasswordCollector {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    verify: boolean;
-  };
-  // (undocumented)
-  type: 'PasswordCollector';
+export interface OutgoingQueryParams {
+    // (undocumented)
+    [key: string]: string | string[];
 }
 
-// @public
-export type PasswordField = {
-  type: 'PASSWORD' | 'PASSWORD_VERIFY';
-  key: string;
-  label: string;
-  required?: boolean;
-  verify?: boolean;
-  passwordPolicy?: PasswordPolicy;
-};
-
 // @public (undocumented)
-export interface PasswordPolicy {
-  // (undocumented)
-  createdAt?: string;
-  // (undocumented)
-  default?: boolean;
-  // (undocumented)
-  description?: string;
-  // (undocumented)
-  excludesCommonlyUsed?: boolean;
-  // (undocumented)
-  excludesProfileData?: boolean;
-  // (undocumented)
-  history?: {
-    count?: number;
-    retentionDays?: number;
-  };
-  // (undocumented)
-  id?: string;
-  // (undocumented)
-  length?: {
-    min?: number;
-    max?: number;
-  };
-  // (undocumented)
-  lockout?: {
-    failureCount?: number;
-    durationSeconds?: number;
-  };
-  // (undocumented)
-  maxAgeDays?: number;
-  // (undocumented)
-  maxRepeatedCharacters?: number;
-  // (undocumented)
-  minAgeDays?: number;
-  // (undocumented)
-  minCharacters?: Record<string, number>;
-  // (undocumented)
-  minUniqueCharacters?: number;
-  // (undocumented)
-  name?: string;
-  // (undocumented)
-  notSimilarToCurrent?: boolean;
-  // (undocumented)
-  populationCount?: number;
-  // (undocumented)
-  updatedAt?: string;
-}
+export type PasswordCollector = SingleValueCollectorNoValue<'PasswordCollector'>;
 
 // @public (undocumented)
-export type PhoneNumberCollector = ObjectValueCollectorWithObjectValue<
-  'PhoneNumberCollector',
-  PhoneNumberInputValue,
-  PhoneNumberOutputValue
->;
+export type PhoneNumberCollector = ObjectValueCollectorWithObjectValue<'PhoneNumberCollector', PhoneNumberInputValue, PhoneNumberOutputValue>;
 
 // @public (undocumented)
-export interface PhoneNumberExtensionCollector {
-  // (undocumented)
-  category: 'ObjectValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: PhoneNumberExtensionInputValue;
-    type: string;
-    validation: (ValidationRequired | ValidationPhoneNumber)[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
+export type PhoneNumberField = {
+    type: 'PHONE_NUMBER';
     key: string;
     label: string;
-    type: string;
-    extensionLabel: string;
-    value: PhoneNumberExtensionOutputValue;
-  };
-  // (undocumented)
-  type: 'PhoneNumberExtensionCollector';
-}
-
-// @public (undocumented)
-export type PhoneNumberExtensionField = PhoneNumberField & {
-  showExtension: boolean;
-  extensionLabel: string;
-};
-
-// @public (undocumented)
-export interface PhoneNumberExtensionInputValue {
-  // (undocumented)
-  countryCode: string;
-  // (undocumented)
-  extension: string;
-  // (undocumented)
-  phoneNumber: string;
-}
-
-// @public (undocumented)
-export interface PhoneNumberExtensionOutputValue {
-  // (undocumented)
-  countryCode?: string;
-  // (undocumented)
-  extension?: string;
-  // (undocumented)
-  phoneNumber?: string;
-}
-
-// @public (undocumented)
-export type PhoneNumberField = {
-  type: 'PHONE_NUMBER';
-  key: string;
-  label: string;
-  required: boolean;
-  defaultCountryCode: string | null;
-  validatePhoneNumber: boolean;
+    defaultCountryCode: string | null;
+    required: boolean;
+    validatePhoneNumber: boolean;
 };
 
 // @public (undocumented)
 export interface PhoneNumberInputValue {
-  // (undocumented)
-  countryCode: string;
-  // (undocumented)
-  phoneNumber: string;
+    // (undocumented)
+    countryCode: string;
+    // (undocumented)
+    phoneNumber: string;
 }
 
 // @public (undocumented)
 export interface PhoneNumberOutputValue {
-  // (undocumented)
-  countryCode?: string;
-  // (undocumented)
-  phoneNumber?: string;
+    // (undocumented)
+    countryCode?: string;
+    // (undocumented)
+    phoneNumber?: string;
 }
 
 // @public (undocumented)
 export type Poller = () => Promise<PollingStatus | InternalErrorResponse>;
 
 // @public (undocumented)
-export type PollingCollector = AutoCollector<
-  'SingleValueAutoCollector',
-  'PollingCollector',
-  string,
-  PollingOutputValue
->;
+export type PollingCollector = AutoCollector<'SingleValueAutoCollector', 'PollingCollector', string, PollingOutputValue>;
 
 // @public (undocumented)
 export type PollingField = {
-  type: 'POLLING';
-  key: string;
-  pollInterval: number;
-  pollRetries: number;
-  pollChallengeStatus?: boolean;
-  challenge?: string;
+    type: 'POLLING';
+    key: string;
+    pollInterval: number;
+    pollRetries: number;
+    pollChallengeStatus?: boolean;
+    challenge?: string;
 };
 
 // @public (undocumented)
 export interface PollingOutputValue {
-  // (undocumented)
-  challenge?: string;
-  // (undocumented)
-  pollChallengeStatus?: boolean;
-  // (undocumented)
-  pollInterval: number;
-  // (undocumented)
-  pollRetries: number;
-  // (undocumented)
-  retriesRemaining?: number;
+    // (undocumented)
+    challenge?: string;
+    // (undocumented)
+    pollChallengeStatus?: boolean;
+    // (undocumented)
+    pollInterval: number;
+    // (undocumented)
+    pollRetries: number;
+    // (undocumented)
+    retriesRemaining?: number;
 }
 
 // @public (undocumented)
 export type PollingStatus = PollingStatusContinue | PollingStatusChallenge;
 
 // @public (undocumented)
-export type PollingStatusChallenge =
-  | PollingStatusChallengeComplete
-  | 'expired'
-  | 'timedOut'
-  | 'error';
+export type PollingStatusChallenge = PollingStatusChallengeComplete | 'expired' | 'timedOut' | 'error';
 
 // @public (undocumented)
-export type PollingStatusChallengeComplete =
-  | 'approved'
-  | 'denied'
-  | 'continue'
-  | CustomPollingStatus;
+export type PollingStatusChallengeComplete = 'approved' | 'denied' | 'continue' | CustomPollingStatus;
 
 // @public (undocumented)
 export type PollingStatusContinue = 'continue' | 'timedOut';
 
 // @public (undocumented)
-export type ProtectCollector = AutoCollector<
-  'SingleValueAutoCollector',
-  'ProtectCollector',
-  string,
-  ProtectOutputValue
->;
+export type ProtectCollector = AutoCollector<'SingleValueAutoCollector', 'ProtectCollector', string, ProtectOutputValue>;
 
 // @public (undocumented)
 export type ProtectField = {
-  type: 'PROTECT';
-  key: string;
-  behavioralDataCollection: boolean;
-  universalDeviceIdentification: boolean;
+    type: 'PROTECT';
+    key: string;
+    behavioralDataCollection: boolean;
+    universalDeviceIdentification: boolean;
 };
 
 // @public
 export interface ProtectOutputValue {
-  // (undocumented)
-  behavioralDataCollection: boolean;
-  // (undocumented)
-  universalDeviceIdentification: boolean;
+    // (undocumented)
+    behavioralDataCollection: boolean;
+    // (undocumented)
+    universalDeviceIdentification: boolean;
 }
 
-// @public
-export interface QrCodeCollector extends NoValueCollectorBase<'QrCodeCollector'> {
-  // (undocumented)
-  output: NoValueCollectorBase<'QrCodeCollector'>['output'] & {
-    src: string;
-  };
+// @public (undocumented)
+export type QrCodeCollector = QrCodeCollectorBase;
+
+// @public (undocumented)
+export interface QrCodeCollectorBase {
+    // (undocumented)
+    category: 'NoValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        src: string;
+    };
+    // (undocumented)
+    type: 'QrCodeCollector';
 }
 
 // @public (undocumented)
 export type QrCodeField = {
-  type: 'QR_CODE';
-  key: string;
-  content: string;
-  fallbackText?: string;
+    type: 'QR_CODE';
+    key: string;
+    content: string;
+    fallbackText?: string;
 };
 
-// @public
-export interface ReadOnlyCollector extends NoValueCollectorBase<'ReadOnlyCollector'> {
-  // (undocumented)
-  output: NoValueCollectorBase<'ReadOnlyCollector'>['output'] & {
-    content: string;
-  };
-}
+// @public (undocumented)
+export type ReadOnlyCollector = NoValueCollectorBase<'ReadOnlyCollector'>;
 
-// @public
+// @public (undocumented)
 export type ReadOnlyField = {
-  type: 'LABEL';
-  content: string;
-  richContent?: RichContent;
-  key?: string;
+    type: 'LABEL';
+    content: string;
+    key?: string;
 };
 
 // @public (undocumented)
@@ -2117,60 +1462,23 @@ export type ReadOnlyFields = ReadOnlyField | QrCodeField | AgreementField;
 
 // @public (undocumented)
 export type RedirectField = {
-  type: 'SOCIAL_LOGIN_BUTTON';
-  key: string;
-  label: string;
-  links: Links;
+    type: 'SOCIAL_LOGIN_BUTTON';
+    key: string;
+    label: string;
+    links: Links;
 };
 
 // @public (undocumented)
 export type RedirectFields = RedirectField;
 
-export { RequestMiddleware };
-
-// @public
-export type RichContent = {
-  content: string;
-  replacements?: Record<string, RichContentReplacement>;
-};
-
-// @public
-export interface RichContentLink {
-  // (undocumented)
-  href: string;
-  // (undocumented)
-  key: string;
-  // (undocumented)
-  target?: '_self' | '_blank';
-  // (undocumented)
-  type: 'link';
-  // (undocumented)
-  value: string;
-}
-
-// @public
-export type RichContentReplacement = {
-  type: 'link';
-  value: string;
-  href: string;
-  target?: '_self' | '_blank';
-};
-
-// @public
-export interface RichTextCollector extends NoValueCollectorBase<'RichTextCollector'> {
-  // (undocumented)
-  output: NoValueCollectorBase<'RichTextCollector'>['output'] & {
-    content: string;
-    richContent: CollectorRichContent;
-  };
-}
+export { RequestMiddleware }
 
 // @public (undocumented)
 export interface SelectorOption {
-  // (undocumented)
-  label: string;
-  // (undocumented)
-  value: string;
+    // (undocumented)
+    label: string;
+    // (undocumented)
+    value: string;
 }
 
 // @public (undocumented)
@@ -2178,200 +1486,173 @@ export type SingleSelectCollector = SingleSelectCollectorWithValue<'SingleSelect
 
 // @public (undocumented)
 export interface SingleSelectCollectorNoValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    options: SelectorOption[];
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'SingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        options: SelectorOption[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
 export interface SingleSelectCollectorWithValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value: string | number | boolean;
-    options: SelectorOption[];
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'SingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value: string | number | boolean;
+        options: SelectorOption[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
 export type SingleSelectField = {
-  inputType: 'SINGLE_SELECT';
-  key: string;
-  label: string;
-  options: {
+    inputType: 'SINGLE_SELECT';
+    key: string;
     label: string;
-    value: string;
-  }[];
-  required?: boolean;
-  type: 'RADIO' | 'DROPDOWN';
+    options: {
+        label: string;
+        value: string;
+    }[];
+    required?: boolean;
+    type: 'RADIO' | 'DROPDOWN';
 };
 
 // @public (undocumented)
-export type SingleValueAutoCollector = AutoCollector<
-  'SingleValueAutoCollector',
-  'SingleValueAutoCollector',
-  string
->;
+export type SingleValueAutoCollector = AutoCollector<'SingleValueAutoCollector', 'SingleValueAutoCollector', string>;
 
 // @public (undocumented)
-export type SingleValueAutoCollectorTypes =
-  | 'SingleValueAutoCollector'
-  | 'ProtectCollector'
-  | 'PollingCollector';
+export type SingleValueAutoCollectorTypes = 'SingleValueAutoCollector' | 'ProtectCollector' | 'PollingCollector';
 
 // @public
-export type SingleValueCollector<T extends SingleValueCollectorTypes> =
-  | SingleValueCollectorWithValue<T>
-  | SingleValueCollectorNoValue<T>;
+export type SingleValueCollector<T extends SingleValueCollectorTypes> = SingleValueCollectorWithValue<T> | SingleValueCollectorNoValue<T>;
 
 // @public (undocumented)
 export interface SingleValueCollectorNoValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'SingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type SingleValueCollectors =
-  | PasswordCollector
-  | ValidatedPasswordCollector
-  | SingleSelectCollectorWithValue<'SingleSelectCollector'>
-  | SingleValueCollectorWithValue<'SingleValueCollector'>
-  | SingleValueCollectorWithValue<'TextCollector'>
-  | ValidatedSingleValueCollectorWithValue<'TextCollector'>;
+export type SingleValueCollectors = SingleValueCollectorNoValue<'PasswordCollector'> | SingleSelectCollectorWithValue<'SingleSelectCollector'> | SingleValueCollectorWithValue<'SingleValueCollector'> | SingleValueCollectorWithValue<'TextCollector'> | ValidatedSingleValueCollectorWithValue<'TextCollector'>;
 
 // @public
-export type SingleValueCollectorTypes =
-  | 'PasswordCollector'
-  | 'ValidatedPasswordCollector'
-  | 'SingleValueCollector'
-  | 'SingleSelectCollector'
-  | 'SingleSelectObjectCollector'
-  | 'TextCollector'
-  | 'ValidatedTextCollector';
+export type SingleValueCollectorTypes = 'PasswordCollector' | 'SingleValueCollector' | 'SingleSelectCollector' | 'SingleSelectObjectCollector' | 'TextCollector' | 'ValidatedTextCollector';
 
 // @public (undocumented)
 export interface SingleValueCollectorWithValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value: string | number | boolean;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'SingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value: string | number | boolean;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type SingleValueFields =
-  | StandardField
-  | PasswordField
-  | ValidatedField
-  | SingleSelectField
-  | ProtectField;
+export type SingleValueFields = StandardField | ValidatedField | SingleSelectField | ProtectField;
 
 // @public (undocumented)
 export type StandardField = {
-  type: 'TEXT' | 'SUBMIT_BUTTON' | 'FLOW_BUTTON' | 'FLOW_LINK' | 'BUTTON';
-  key: string;
-  label: string;
-  required?: boolean;
+    type: 'PASSWORD' | 'PASSWORD_VERIFY' | 'TEXT' | 'SUBMIT_BUTTON' | 'FLOW_BUTTON' | 'FLOW_LINK' | 'BUTTON';
+    key: string;
+    label: string;
+    required?: boolean;
 };
 
 // @public (undocumented)
 export interface StartNode {
-  // (undocumented)
-  cache: null;
-  // (undocumented)
-  client: {
-    status: 'start';
-  };
-  // (undocumented)
-  error: DaVinciError | null;
-  // (undocumented)
-  server: {
+    // (undocumented)
+    cache: null;
+    // (undocumented)
+    client: {
+        status: 'start';
+    };
+    // (undocumented)
+    error: DaVinciError | null;
+    // (undocumented)
+    server: {
+        status: 'start';
+    };
+    // (undocumented)
     status: 'start';
-  };
-  // (undocumented)
-  status: 'start';
 }
 
 // @public (undocumented)
 export interface StartOptions<Query extends OutgoingQueryParams = OutgoingQueryParams> {
-  // (undocumented)
-  query: Query;
+    // (undocumented)
+    query: Query;
 }
 
 // @public (undocumented)
@@ -2379,35 +1660,35 @@ export type SubmitCollector = ActionCollectorNoUrl<'SubmitCollector'>;
 
 // @public (undocumented)
 export interface SuccessNode {
-  // (undocumented)
-  cache: {
-    key: string;
-  };
-  // (undocumented)
-  client: {
-    authorization?: {
-      code?: string;
-      state?: string;
+    // (undocumented)
+    cache: {
+        key: string;
     };
+    // (undocumented)
+    client: {
+        authorization?: {
+            code?: string;
+            state?: string;
+        };
+        status: 'success';
+    } | null;
+    // (undocumented)
+    error: null;
+    // (undocumented)
+    httpStatus: number;
+    // (undocumented)
+    server: {
+        _links?: Links;
+        eventName?: string;
+        id?: string;
+        interactionId?: string;
+        interactionToken?: string;
+        href?: string;
+        session?: string;
+        status: 'success';
+    };
+    // (undocumented)
     status: 'success';
-  } | null;
-  // (undocumented)
-  error: null;
-  // (undocumented)
-  httpStatus: number;
-  // (undocumented)
-  server: {
-    _links?: Links;
-    eventName?: string;
-    id?: string;
-    interactionId?: string;
-    interactionToken?: string;
-    href?: string;
-    session?: string;
-    status: 'success';
-  };
-  // (undocumented)
-  status: 'success';
 }
 
 // @public (undocumented)
@@ -2415,119 +1696,79 @@ export type TextCollector = SingleValueCollectorWithValue<'TextCollector'>;
 
 // @public (undocumented)
 export interface ThrownQueryError {
-  // (undocumented)
-  error: FetchBaseQueryError;
-  // (undocumented)
-  isHandledError: boolean;
-  // (undocumented)
-  meta: FetchBaseQueryMeta;
+    // (undocumented)
+    error: FetchBaseQueryError;
+    // (undocumented)
+    isHandledError: boolean;
+    // (undocumented)
+    meta: FetchBaseQueryMeta;
 }
 
 // @public
 export type UnknownCollector = {
-  category: 'UnknownCollector';
-  error: string | null;
-  type: 'UnknownCollector';
-  id: string;
-  name: string;
-  output: {
-    key: string;
-    label: string;
-    type: string;
-  };
+    category: 'UnknownCollector';
+    error: string | null;
+    type: 'UnknownCollector';
+    id: string;
+    name: string;
+    output: {
+        key: string;
+        label: string;
+        type: string;
+    };
 };
 
 // @public (undocumented)
 export type UnknownField = Record<string, unknown>;
 
 // @public (undocumented)
-export const updateCollectorValues: ActionCreatorWithPayload<
-  {
-    id: string;
-    value:
-      | string
-      | string[]
-      | PhoneNumberInputValue
-      | PhoneNumberExtensionInputValue
-      | FidoRegistrationInputValue
-      | FidoAuthenticationInputValue;
-    index?: number;
-  },
-  string
->;
+export const updateCollectorValues: ActionCreatorWithPayload<    {
+id: string;
+value: string | string[] | PhoneNumberInputValue | FidoRegistrationInputValue | FidoAuthenticationInputValue;
+index?: number;
+}, string>;
 
 // @public
-export type Updater<T = unknown> = (
-  value: CollectorValueType<T>,
-  index?: number,
-) => InternalErrorResponse | null;
+export type Updater<T = unknown> = (value: CollectorValueType<T>, index?: number) => InternalErrorResponse | null;
 
 // @public (undocumented)
 export type ValidatedField = {
-  type: 'TEXT';
-  key: string;
-  label: string;
-  required: boolean;
-  validation: {
-    regex: string;
-    errorMessage: string;
-  };
-};
-
-// @public (undocumented)
-export interface ValidatedPasswordCollector {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-    validation: PasswordPolicy;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
+    type: 'TEXT';
     key: string;
     label: string;
-    type: string;
-    verify: boolean;
-  };
-  // (undocumented)
-  type: 'ValidatedPasswordCollector';
-}
+    required: boolean;
+    validation: {
+        regex: string;
+        errorMessage: string;
+    };
+};
 
 // @public (undocumented)
 export interface ValidatedSingleValueCollectorWithValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'ValidatedSingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-    validation: (ValidationRequired | ValidationRegex)[];
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value: string | number | boolean;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'ValidatedSingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+        validation: (ValidationRequired | ValidationRegex)[];
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value: string | number | boolean;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
@@ -2535,44 +1776,43 @@ export type ValidatedTextCollector = ValidatedSingleValueCollectorWithValue<'Tex
 
 // @public (undocumented)
 export interface ValidationPhoneNumber {
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  rule: boolean;
-  // (undocumented)
-  type: 'validatePhoneNumber';
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    rule: boolean;
+    // (undocumented)
+    type: 'validatePhoneNumber';
 }
 
 // @public (undocumented)
 export interface ValidationRegex {
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  rule: string;
-  // (undocumented)
-  type: 'regex';
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    rule: string;
+    // (undocumented)
+    type: 'regex';
 }
 
 // @public (undocumented)
 export interface ValidationRequired {
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  rule: boolean;
-  // (undocumented)
-  type: 'required';
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    rule: boolean;
+    // (undocumented)
+    type: 'required';
 }
 
 // @public (undocumented)
-export type Validator = (value: string) =>
-  | string[]
-  | {
-      error: {
+export type Validator = (value: string) => string[] | {
+    error: {
         message: string;
         type: string;
-      };
-      type: string;
     };
+    type: string;
+};
 
 // (No @packageDocumentation comment for this package)
+
 ```
diff --git a/packages/davinci-client/api-report/davinci-client.types.api.md b/packages/davinci-client/api-report/davinci-client.types.api.md
index 1ef11fb121..4d355416b3 100644
--- a/packages/davinci-client/api-report/davinci-client.types.api.md
+++ b/packages/davinci-client/api-report/davinci-client.types.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+
 import { ActionCreatorWithPayload } from '@reduxjs/toolkit';
 import { ActionTypes } from '@forgerock/sdk-request-middleware';
 import type { AsyncLegacyConfigOptions } from '@forgerock/sdk-types';
@@ -24,427 +25,305 @@ import { SerializedError } from '@reduxjs/toolkit';
 import { Unsubscribe } from '@reduxjs/toolkit';
 
 // @public (undocumented)
-export type ActionCollector<T extends ActionCollectorTypes> =
-  | ActionCollectorNoUrl<T>
-  | ActionCollectorWithUrl<T>;
+export type ActionCollector<T extends ActionCollectorTypes> = ActionCollectorNoUrl<T> | ActionCollectorWithUrl<T>;
 
 // @public (undocumented)
 export interface ActionCollectorNoUrl<T extends ActionCollectorTypes> {
-  // (undocumented)
-  category: 'ActionCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'ActionCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type ActionCollectors =
-  | ActionCollectorWithUrl<'IdpCollector'>
-  | ActionCollectorNoUrl<'ActionCollector'>
-  | ActionCollectorNoUrl<'FlowCollector'>
-  | ActionCollectorNoUrl<'SubmitCollector'>;
+export type ActionCollectors = ActionCollectorWithUrl<'IdpCollector'> | ActionCollectorNoUrl<'ActionCollector'> | ActionCollectorNoUrl<'FlowCollector'> | ActionCollectorNoUrl<'SubmitCollector'>;
 
 // @public
-export type ActionCollectorTypes =
-  | 'FlowCollector'
-  | 'SubmitCollector'
-  | 'IdpCollector'
-  | 'ActionCollector';
+export type ActionCollectorTypes = 'FlowCollector' | 'SubmitCollector' | 'IdpCollector' | 'ActionCollector';
 
 // @public (undocumented)
 export interface ActionCollectorWithUrl<T extends ActionCollectorTypes> {
-  // (undocumented)
-  category: 'ActionCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    url?: string | null;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'ActionCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        url?: string | null;
+    };
+    // (undocumented)
+    type: T;
 }
 
-export { ActionTypes };
+export { ActionTypes }
 
 // @public (undocumented)
 export interface AgreementCollector extends NoValueCollectorBase<'AgreementCollector'> {
-  // (undocumented)
-  output: {
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        titleEnabled: boolean;
+        title: string;
+        agreement: {
+            id: string;
+            useDynamicAgreement: boolean;
+        };
+        enabled: boolean;
+    };
+}
+
+// @public (undocumented)
+export type AgreementField = {
+    type: 'AGREEMENT';
     key: string;
-    label: string;
-    type: string;
+    content: string;
     titleEnabled: boolean;
     title: string;
     agreement: {
-      id: string;
-      useDynamicAgreement: boolean;
+        id: string;
+        useDynamicAgreement: boolean;
     };
     enabled: boolean;
-  };
-}
-
-// @public (undocumented)
-export type AgreementField = {
-  type: 'AGREEMENT';
-  key: string;
-  content: string;
-  titleEnabled: boolean;
-  title: string;
-  agreement: {
-    id: string;
-    useDynamicAgreement: boolean;
-  };
-  enabled: boolean;
 };
 
 // @public (undocumented)
-export interface AssertionValue extends Omit<
-  PublicKeyCredential,
-  'rawId' | 'response' | 'getClientExtensionResults' | 'toJSON'
-> {
-  // (undocumented)
-  rawId: string;
-  // (undocumented)
-  response: {
-    clientDataJSON: string;
-    authenticatorData: string;
-    signature: string;
-    userHandle: string | null;
-  };
+export interface AssertionValue extends Omit<PublicKeyCredential, 'rawId' | 'response' | 'getClientExtensionResults' | 'toJSON'> {
+    // (undocumented)
+    rawId: string;
+    // (undocumented)
+    response: {
+        clientDataJSON: string;
+        authenticatorData: string;
+        signature: string;
+        userHandle: string | null;
+    };
 }
 
 // @public (undocumented)
-export interface AttestationValue extends Omit<
-  PublicKeyCredential,
-  'rawId' | 'response' | 'getClientExtensionResults' | 'toJSON'
-> {
-  // (undocumented)
-  rawId: string;
-  // (undocumented)
-  response: {
-    clientDataJSON: string;
-    attestationObject: string;
-  };
+export interface AttestationValue extends Omit<PublicKeyCredential, 'rawId' | 'response' | 'getClientExtensionResults' | 'toJSON'> {
+    // (undocumented)
+    rawId: string;
+    // (undocumented)
+    response: {
+        clientDataJSON: string;
+        attestationObject: string;
+    };
 }
 
 // @public (undocumented)
-export interface AutoCollector<
-  C extends AutoCollectorCategories,
-  T extends AutoCollectorTypes,
-  IV = string,
-  OV = Record<string, unknown>,
-> {
-  // (undocumented)
-  category: C;
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: IV;
-    type: string;
-    validation?: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    type: string;
-    config: OV;
-  };
-  // (undocumented)
-  type: T;
+export interface AutoCollector<C extends AutoCollectorCategories, T extends AutoCollectorTypes, IV = string, OV = Record<string, unknown>> {
+    // (undocumented)
+    category: C;
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: IV;
+        type: string;
+        validation?: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        type: string;
+        config: OV;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
 export type AutoCollectorCategories = 'SingleValueAutoCollector' | 'ObjectValueAutoCollector';
 
 // @public (undocumented)
-export type AutoCollectors =
-  | ProtectCollector
-  | FidoRegistrationCollector
-  | FidoAuthenticationCollector
-  | PollingCollector
-  | SingleValueAutoCollector
-  | ObjectValueAutoCollector;
+export type AutoCollectors = ProtectCollector | FidoRegistrationCollector | FidoAuthenticationCollector | PollingCollector | SingleValueAutoCollector | ObjectValueAutoCollector;
 
 // @public (undocumented)
 export type AutoCollectorTypes = SingleValueAutoCollectorTypes | ObjectValueAutoCollectorTypes;
 
 // @public (undocumented)
 export interface CollectorErrors {
-  // (undocumented)
-  code: string;
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  target: string;
-}
-
-// @public
-export interface CollectorRichContent {
-  // (undocumented)
-  content: string;
-  // (undocumented)
-  replacements: RichContentLink[];
+    // (undocumented)
+    code: string;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    target: string;
 }
 
 // @public (undocumented)
-export type Collectors =
-  | FlowCollector
-  | PasswordCollector
-  | ValidatedPasswordCollector
-  | TextCollector
-  | SingleSelectCollector
-  | IdpCollector
-  | SubmitCollector
-  | ActionCollector<'ActionCollector'>
-  | SingleValueCollector<'SingleValueCollector'>
-  | MultiSelectCollector
-  | DeviceAuthenticationCollector
-  | DeviceRegistrationCollector
-  | PhoneNumberCollector
-  | PhoneNumberExtensionCollector
-  | ReadOnlyCollector
-  | RichTextCollector
-  | ValidatedTextCollector
-  | ProtectCollector
-  | PollingCollector
-  | FidoRegistrationCollector
-  | FidoAuthenticationCollector
-  | QrCodeCollector
-  | AgreementCollector
-  | UnknownCollector;
+export type Collectors = FlowCollector | PasswordCollector | TextCollector | SingleSelectCollector | IdpCollector | SubmitCollector | ActionCollector<'ActionCollector'> | SingleValueCollector<'SingleValueCollector'> | MultiSelectCollector | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector | ReadOnlyCollector | ValidatedTextCollector | ProtectCollector | PollingCollector | FidoRegistrationCollector | FidoAuthenticationCollector | QrCodeCollector | AgreementCollector | UnknownCollector;
 
 // @public
 export type CollectorValueType<T> = T extends {
-  type: 'PasswordCollector';
-}
-  ? string
-  : T extends {
-        type: 'ValidatedPasswordCollector';
-      }
-    ? string
-    : T extends {
-          type: 'TextCollector';
-          category: 'SingleValueCollector';
-        }
-      ? string
-      : T extends {
-            type: 'TextCollector';
-            category: 'ValidatedSingleValueCollector';
-          }
-        ? string
-        : T extends {
-              type: 'SingleSelectCollector';
-            }
-          ? string
-          : T extends {
-                type: 'MultiSelectCollector';
-              }
-            ? string[]
-            : T extends {
-                  type: 'DeviceRegistrationCollector';
-                }
-              ? string
-              : T extends {
-                    type: 'DeviceAuthenticationCollector';
-                  }
-                ? string
-                : T extends {
-                      type: 'PhoneNumberCollector';
-                    }
-                  ? PhoneNumberInputValue
-                  : T extends {
-                        type: 'FidoRegistrationCollector';
-                      }
-                    ? FidoRegistrationInputValue
-                    : T extends {
-                          type: 'FidoAuthenticationCollector';
-                        }
-                      ? FidoAuthenticationInputValue
-                      : T extends {
-                            category: 'SingleValueCollector';
-                          }
-                        ? string
-                        : T extends {
-                              category: 'ValidatedSingleValueCollector';
-                            }
-                          ? string
-                          : T extends {
-                                category: 'MultiValueCollector';
-                              }
-                            ? string[]
-                            :
-                                | string
-                                | string[]
-                                | PhoneNumberInputValue
-                                | FidoRegistrationInputValue
-                                | FidoAuthenticationInputValue;
-
-// @public (undocumented)
-export type ComplexValueFields =
-  | DeviceAuthenticationField
-  | DeviceRegistrationField
-  | PhoneNumberField
-  | PhoneNumberExtensionField
-  | FidoRegistrationField
-  | FidoAuthenticationField
-  | PollingField;
+    type: 'PasswordCollector';
+} ? string : T extends {
+    type: 'TextCollector';
+    category: 'SingleValueCollector';
+} ? string : T extends {
+    type: 'TextCollector';
+    category: 'ValidatedSingleValueCollector';
+} ? string : T extends {
+    type: 'SingleSelectCollector';
+} ? string : T extends {
+    type: 'MultiSelectCollector';
+} ? string[] : T extends {
+    type: 'DeviceRegistrationCollector';
+} ? string : T extends {
+    type: 'DeviceAuthenticationCollector';
+} ? string : T extends {
+    type: 'PhoneNumberCollector';
+} ? PhoneNumberInputValue : T extends {
+    type: 'FidoRegistrationCollector';
+} ? FidoRegistrationInputValue : T extends {
+    type: 'FidoAuthenticationCollector';
+} ? FidoAuthenticationInputValue : T extends {
+    category: 'SingleValueCollector';
+} ? string : T extends {
+    category: 'ValidatedSingleValueCollector';
+} ? string : T extends {
+    category: 'MultiValueCollector';
+} ? string[] : string | string[] | PhoneNumberInputValue | FidoRegistrationInputValue | FidoAuthenticationInputValue;
+
+// @public (undocumented)
+export type ComplexValueFields = DeviceAuthenticationField | DeviceRegistrationField | PhoneNumberField | FidoRegistrationField | FidoAuthenticationField | PollingField;
 
 // @public (undocumented)
 export interface ContinueNode {
-  // (undocumented)
-  cache: {
-    key: string;
-  };
-  // (undocumented)
-  client: {
-    action: string;
-    collectors: Collectors[];
-    description?: string;
-    name?: string;
-    status: 'continue';
-  };
-  // (undocumented)
-  error: null;
-  // (undocumented)
-  httpStatus: number;
-  // (undocumented)
-  server: {
-    _links?: Links;
-    id?: string;
-    interactionId?: string;
-    interactionToken?: string;
-    href?: string;
-    eventName?: string;
+    // (undocumented)
+    cache: {
+        key: string;
+    };
+    // (undocumented)
+    client: {
+        action: string;
+        collectors: Collectors[];
+        description?: string;
+        name?: string;
+        status: 'continue';
+    };
+    // (undocumented)
+    error: null;
+    // (undocumented)
+    httpStatus: number;
+    // (undocumented)
+    server: {
+        _links?: Links;
+        id?: string;
+        interactionId?: string;
+        interactionToken?: string;
+        href?: string;
+        eventName?: string;
+        status: 'continue';
+    };
+    // (undocumented)
     status: 'continue';
-  };
-  // (undocumented)
-  status: 'continue';
 }
 
-export { CustomLogger };
+export { CustomLogger }
 
 // @public
 export type CustomPollingStatus = string & {};
 
 // @public
 export function davinci<ActionType extends ActionTypes = ActionTypes>(input: {
-  config: DaVinciConfig;
-  requestMiddleware?: RequestMiddleware<ActionType>[];
-  logger?: {
-    level: LogLevel;
-    custom?: CustomLogger;
-  };
+    config: DaVinciConfig;
+    requestMiddleware?: RequestMiddleware<ActionType>[];
+    logger?: {
+        level: LogLevel;
+        custom?: CustomLogger;
+    };
 }): Promise<{
-  subscribe: (listener: () => void) => Unsubscribe;
-  externalIdp: () => () => Promise<void | InternalErrorResponse>;
-  flow: (action: DaVinciAction) => InitFlow;
-  next: (args?: DaVinciRequest) => Promise<NodeStates>;
-  resume: (input: { continueToken: string }) => Promise<InternalErrorResponse | NodeStates>;
-  start: <QueryParams extends OutgoingQueryParams = OutgoingQueryParams>(
-    options?: StartOptions<QueryParams> | undefined,
-  ) => Promise<ContinueNode | ErrorNode | FailureNode | StartNode | SuccessNode>;
-  update: <
-    T extends SingleValueCollectors | MultiSelectCollector | ObjectValueCollectors | AutoCollectors,
-  >(
-    collector: T,
-  ) => Updater<T>;
-  validate: (
-    collector:
-      | SingleValueCollectors
-      | ObjectValueCollectors
-      | MultiValueCollectors
-      | AutoCollectors,
-  ) => Validator;
-  pollStatus: (collector: PollingCollector) => Poller;
-  getClient: () =>
-    | {
+    subscribe: (listener: () => void) => Unsubscribe;
+    externalIdp: () => (() => Promise<void | InternalErrorResponse>);
+    flow: (action: DaVinciAction) => InitFlow;
+    next: (args?: DaVinciRequest) => Promise<NodeStates>;
+    resume: (input: {
+        continueToken: string;
+    }) => Promise<InternalErrorResponse | NodeStates>;
+    start: <QueryParams extends OutgoingQueryParams = OutgoingQueryParams>(options?: StartOptions<QueryParams> | undefined) => Promise<ContinueNode | ErrorNode | FailureNode | StartNode | SuccessNode>;
+    update: <T extends SingleValueCollectors | MultiSelectCollector | ObjectValueCollectors | AutoCollectors>(collector: T) => Updater<T>;
+    validate: (collector: SingleValueCollectors | ObjectValueCollectors | MultiValueCollectors | AutoCollectors) => Validator;
+    poll: (collector: PollingCollector) => Poller;
+    getClient: () => {
         action: string;
         collectors: Collectors[];
         description?: string;
         name?: string;
-        status: 'continue';
-      }
-    | {
+        status: "continue";
+    } | {
         action: string;
         collectors: Collectors[];
         description?: string;
         name?: string;
-        status: 'error';
-      }
-    | {
-        status: 'failure';
-      }
-    | {
-        status: 'start';
-      }
-    | {
+        status: "error";
+    } | {
+        status: "failure";
+    } | {
+        status: "start";
+    } | {
         authorization?: {
-          code?: string;
-          state?: string;
+            code?: string;
+            state?: string;
         };
-        status: 'success';
-      }
-    | null;
-  getCollectors: () => Collectors[];
-  getError: () => DaVinciError | null;
-  getErrorCollectors: () => CollectorErrors[];
-  getNode: () => ContinueNode | ErrorNode | FailureNode | StartNode | SuccessNode;
-  getServer: () =>
-    | {
+        status: "success";
+    } | null;
+    getCollectors: () => Collectors[];
+    getError: () => DaVinciError | null;
+    getErrorCollectors: () => CollectorErrors[];
+    getNode: () => ContinueNode | ErrorNode | FailureNode | StartNode | SuccessNode;
+    getServer: () => {
         _links?: Links;
         id?: string;
         interactionId?: string;
         interactionToken?: string;
         href?: string;
         eventName?: string;
-        status: 'continue';
-      }
-    | {
+        status: "continue";
+    } | {
         _links?: Links;
         eventName?: string;
         id?: string;
         interactionId?: string;
         interactionToken?: string;
-        status: 'error';
-      }
-    | {
+        status: "error";
+    } | {
         _links?: Links;
         eventName?: string;
         href?: string;
         id?: string;
         interactionId?: string;
         interactionToken?: string;
-        status: 'failure';
-      }
-    | {
-        status: 'start';
-      }
-    | {
+        status: "failure";
+    } | {
+        status: "start";
+    } | {
         _links?: Links;
         eventName?: string;
         id?: string;
@@ -452,431 +331,240 @@ export function davinci<ActionType extends ActionTypes = ActionTypes>(input: {
         interactionToken?: string;
         href?: string;
         session?: string;
-        status: 'success';
-      }
-    | null;
-  cache: {
-    getLatestResponse: () =>
-      | ((
-          state: RootState<
-            {
-              flow: MutationDefinition<
-                any,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                any
-              >;
-              next: MutationDefinition<
-                any,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                any
-              >;
-              start: MutationDefinition<
-                StartOptions<OutgoingQueryParams> | undefined,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-              resume: QueryDefinition<
-                {
-                  serverInfo: ContinueNode['server'];
-                  continueToken: string;
-                },
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-              poll: MutationDefinition<
-                {
-                  endpoint: string;
-                  interactionId: string;
-                },
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-            },
-            never,
-            'davinci'
-          >,
-        ) =>
-          | ({
-              requestId?: undefined;
-              status: QueryStatus.uninitialized;
-              data?: undefined;
-              error?: undefined;
-              endpointName?: string;
-              startedTimeStamp?: undefined;
-              fulfilledTimeStamp?: undefined;
-            } & {
-              status: QueryStatus.uninitialized;
-              isUninitialized: true;
-              isLoading: false;
-              isSuccess: false;
-              isError: false;
-            })
-          | ({
-              status: QueryStatus.fulfilled;
-            } & Omit<
-              {
-                requestId: string;
-                data?: unknown;
-                error?: FetchBaseQueryError | SerializedError | undefined;
-                endpointName: string;
-                startedTimeStamp: number;
-                fulfilledTimeStamp?: number;
-              },
-              'data' | 'fulfilledTimeStamp'
-            > &
-              Required<
-                Pick<
-                  {
-                    requestId: string;
-                    data?: unknown;
-                    error?: FetchBaseQueryError | SerializedError | undefined;
-                    endpointName: string;
-                    startedTimeStamp: number;
-                    fulfilledTimeStamp?: number;
-                  },
-                  'data' | 'fulfilledTimeStamp'
-                >
-              > & {
-                error: undefined;
-              } & {
-                status: QueryStatus.fulfilled;
-                isUninitialized: false;
-                isLoading: false;
-                isSuccess: true;
-                isError: false;
-              })
-          | ({
-              status: QueryStatus.pending;
-            } & {
-              requestId: string;
-              data?: unknown;
-              error?: FetchBaseQueryError | SerializedError | undefined;
-              endpointName: string;
-              startedTimeStamp: number;
-              fulfilledTimeStamp?: number;
-            } & {
-              data?: undefined;
-            } & {
-              status: QueryStatus.pending;
-              isUninitialized: false;
-              isLoading: true;
-              isSuccess: false;
-              isError: false;
-            })
-          | ({
-              status: QueryStatus.rejected;
-            } & Omit<
-              {
-                requestId: string;
-                data?: unknown;
-                error?: FetchBaseQueryError | SerializedError | undefined;
-                endpointName: string;
-                startedTimeStamp: number;
-                fulfilledTimeStamp?: number;
-              },
-              'error'
-            > &
-              Required<
-                Pick<
-                  {
-                    requestId: string;
-                    data?: unknown;
-                    error?: FetchBaseQueryError | SerializedError | undefined;
-                    endpointName: string;
-                    startedTimeStamp: number;
-                    fulfilledTimeStamp?: number;
-                  },
-                  'error'
-                >
-              > & {
-                status: QueryStatus.rejected;
-                isUninitialized: false;
-                isLoading: false;
-                isSuccess: false;
-                isError: true;
-              }))
-      | {
-          error: {
-            message: string;
-            type: string;
-          };
+        status: "success";
+    } | null;
+    cache: {
+        getLatestResponse: () => ((state: RootState<    {
+        flow: MutationDefinition<any, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", any>;
+        next: MutationDefinition<any, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", any>;
+        start: MutationDefinition<StartOptions<OutgoingQueryParams> | undefined, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        resume: QueryDefinition<    {
+        serverInfo: ContinueNode["server"];
+        continueToken: string;
+        }, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        poll: MutationDefinition<    {
+        endpoint: string;
+        interactionId: string;
+        }, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        }, never, "davinci">) => ({
+            requestId?: undefined;
+            status: QueryStatus.uninitialized;
+            data?: undefined;
+            error?: undefined;
+            endpointName?: string;
+            startedTimeStamp?: undefined;
+            fulfilledTimeStamp?: undefined;
+        } & {
+            status: QueryStatus.uninitialized;
+            isUninitialized: true;
+            isLoading: false;
+            isSuccess: false;
+            isError: false;
+        }) | ({
+            status: QueryStatus.fulfilled;
+        } & Omit<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "data" | "fulfilledTimeStamp"> & Required<Pick<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "data" | "fulfilledTimeStamp">> & {
+            error: undefined;
+        } & {
+            status: QueryStatus.fulfilled;
+            isUninitialized: false;
+            isLoading: false;
+            isSuccess: true;
+            isError: false;
+        }) | ({
+            status: QueryStatus.pending;
+        } & {
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        } & {
+            data?: undefined;
+        } & {
+            status: QueryStatus.pending;
+            isUninitialized: false;
+            isLoading: true;
+            isSuccess: false;
+            isError: false;
+        }) | ({
+            status: QueryStatus.rejected;
+        } & Omit<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "error"> & Required<Pick<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "error">> & {
+            status: QueryStatus.rejected;
+            isUninitialized: false;
+            isLoading: false;
+            isSuccess: false;
+            isError: true;
+        })) | {
+            error: {
+                message: string;
+                type: string;
+            };
         };
-    getResponseWithId: (requestId: string) =>
-      | ((
-          state: RootState<
-            {
-              flow: MutationDefinition<
-                any,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                any
-              >;
-              next: MutationDefinition<
-                any,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                any
-              >;
-              start: MutationDefinition<
-                StartOptions<OutgoingQueryParams> | undefined,
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-              resume: QueryDefinition<
-                {
-                  serverInfo: ContinueNode['server'];
-                  continueToken: string;
-                },
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-              poll: MutationDefinition<
-                {
-                  endpoint: string;
-                  interactionId: string;
-                },
-                BaseQueryFn<
-                  string | FetchArgs,
-                  unknown,
-                  FetchBaseQueryError,
-                  {},
-                  FetchBaseQueryMeta
-                >,
-                never,
-                unknown,
-                'davinci',
-                unknown
-              >;
-            },
-            never,
-            'davinci'
-          >,
-        ) =>
-          | ({
-              requestId?: undefined;
-              status: QueryStatus.uninitialized;
-              data?: undefined;
-              error?: undefined;
-              endpointName?: string;
-              startedTimeStamp?: undefined;
-              fulfilledTimeStamp?: undefined;
-            } & {
-              status: QueryStatus.uninitialized;
-              isUninitialized: true;
-              isLoading: false;
-              isSuccess: false;
-              isError: false;
-            })
-          | ({
-              status: QueryStatus.fulfilled;
-            } & Omit<
-              {
-                requestId: string;
-                data?: unknown;
-                error?: FetchBaseQueryError | SerializedError | undefined;
-                endpointName: string;
-                startedTimeStamp: number;
-                fulfilledTimeStamp?: number;
-              },
-              'data' | 'fulfilledTimeStamp'
-            > &
-              Required<
-                Pick<
-                  {
-                    requestId: string;
-                    data?: unknown;
-                    error?: FetchBaseQueryError | SerializedError | undefined;
-                    endpointName: string;
-                    startedTimeStamp: number;
-                    fulfilledTimeStamp?: number;
-                  },
-                  'data' | 'fulfilledTimeStamp'
-                >
-              > & {
-                error: undefined;
-              } & {
-                status: QueryStatus.fulfilled;
-                isUninitialized: false;
-                isLoading: false;
-                isSuccess: true;
-                isError: false;
-              })
-          | ({
-              status: QueryStatus.pending;
-            } & {
-              requestId: string;
-              data?: unknown;
-              error?: FetchBaseQueryError | SerializedError | undefined;
-              endpointName: string;
-              startedTimeStamp: number;
-              fulfilledTimeStamp?: number;
-            } & {
-              data?: undefined;
-            } & {
-              status: QueryStatus.pending;
-              isUninitialized: false;
-              isLoading: true;
-              isSuccess: false;
-              isError: false;
-            })
-          | ({
-              status: QueryStatus.rejected;
-            } & Omit<
-              {
-                requestId: string;
-                data?: unknown;
-                error?: FetchBaseQueryError | SerializedError | undefined;
-                endpointName: string;
-                startedTimeStamp: number;
-                fulfilledTimeStamp?: number;
-              },
-              'error'
-            > &
-              Required<
-                Pick<
-                  {
-                    requestId: string;
-                    data?: unknown;
-                    error?: FetchBaseQueryError | SerializedError | undefined;
-                    endpointName: string;
-                    startedTimeStamp: number;
-                    fulfilledTimeStamp?: number;
-                  },
-                  'error'
-                >
-              > & {
-                status: QueryStatus.rejected;
-                isUninitialized: false;
-                isLoading: false;
-                isSuccess: false;
-                isError: true;
-              }))
-      | {
-          error: {
-            message: string;
-            type: string;
-          };
+        getResponseWithId: (requestId: string) => ((state: RootState<    {
+        flow: MutationDefinition<any, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", any>;
+        next: MutationDefinition<any, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", any>;
+        start: MutationDefinition<StartOptions<OutgoingQueryParams> | undefined, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        resume: QueryDefinition<    {
+        serverInfo: ContinueNode["server"];
+        continueToken: string;
+        }, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        poll: MutationDefinition<    {
+        endpoint: string;
+        interactionId: string;
+        }, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, unknown, "davinci", unknown>;
+        }, never, "davinci">) => ({
+            requestId?: undefined;
+            status: QueryStatus.uninitialized;
+            data?: undefined;
+            error?: undefined;
+            endpointName?: string;
+            startedTimeStamp?: undefined;
+            fulfilledTimeStamp?: undefined;
+        } & {
+            status: QueryStatus.uninitialized;
+            isUninitialized: true;
+            isLoading: false;
+            isSuccess: false;
+            isError: false;
+        }) | ({
+            status: QueryStatus.fulfilled;
+        } & Omit<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "data" | "fulfilledTimeStamp"> & Required<Pick<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "data" | "fulfilledTimeStamp">> & {
+            error: undefined;
+        } & {
+            status: QueryStatus.fulfilled;
+            isUninitialized: false;
+            isLoading: false;
+            isSuccess: true;
+            isError: false;
+        }) | ({
+            status: QueryStatus.pending;
+        } & {
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        } & {
+            data?: undefined;
+        } & {
+            status: QueryStatus.pending;
+            isUninitialized: false;
+            isLoading: true;
+            isSuccess: false;
+            isError: false;
+        }) | ({
+            status: QueryStatus.rejected;
+        } & Omit<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "error"> & Required<Pick<{
+            requestId: string;
+            data?: unknown;
+            error?: FetchBaseQueryError | SerializedError | undefined;
+            endpointName: string;
+            startedTimeStamp: number;
+            fulfilledTimeStamp?: number;
+        }, "error">> & {
+            status: QueryStatus.rejected;
+            isUninitialized: false;
+            isLoading: false;
+            isSuccess: false;
+            isError: true;
+        })) | {
+            error: {
+                message: string;
+                type: string;
+            };
         };
-  };
+    };
 }>;
 
 // @public
 export interface DaVinciAction {
-  // (undocumented)
-  action: string;
+    // (undocumented)
+    action: string;
 }
 
 // @public
 export interface DaVinciBaseResponse {
-  // (undocumented)
-  capabilityName?: string;
-  // (undocumented)
-  companyId?: string;
-  // (undocumented)
-  connectionId?: string;
-  // (undocumented)
-  connectorId?: string;
-  // (undocumented)
-  id?: string;
-  // (undocumented)
-  interactionId?: string;
-  // (undocumented)
-  interactionToken?: string;
-  // (undocumented)
-  isResponseCompatibleWithMobileAndWebSdks?: boolean;
-  // (undocumented)
-  status?: string;
+    // (undocumented)
+    capabilityName?: string;
+    // (undocumented)
+    companyId?: string;
+    // (undocumented)
+    connectionId?: string;
+    // (undocumented)
+    connectorId?: string;
+    // (undocumented)
+    id?: string;
+    // (undocumented)
+    interactionId?: string;
+    // (undocumented)
+    interactionToken?: string;
+    // (undocumented)
+    isResponseCompatibleWithMobileAndWebSdks?: boolean;
+    // (undocumented)
+    status?: string;
 }
 
 // @public
 export type DaVinciCacheEntry = {
-  data?: DaVinciBaseResponse;
-  error?: {
-    data: DaVinciBaseResponse;
-    status: number;
-  };
+    data?: DaVinciBaseResponse;
+    error?: {
+        data: DaVinciBaseResponse;
+        status: number;
+    };
 } & {
-  data?: any;
-  error?: any;
+    data?: any;
+    error?: any;
 } & MutationResultSelectorResult<any>;
 
 // @public (undocumented)
@@ -884,467 +572,436 @@ export type DavinciClient = Awaited<ReturnType<typeof davinci>>;
 
 // @public (undocumented)
 export interface DaVinciConfig extends AsyncLegacyConfigOptions {
-  // (undocumented)
-  responseType?: string;
+    // (undocumented)
+    responseType?: string;
 }
 
 // @public (undocumented)
 export interface DaVinciError extends Omit<GenericError, 'error'> {
-  // (undocumented)
-  collectors?: CollectorErrors[];
-  // (undocumented)
-  internalHttpStatus?: number;
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  status: 'error' | 'failure' | 'unknown';
+    // (undocumented)
+    collectors?: CollectorErrors[];
+    // (undocumented)
+    internalHttpStatus?: number;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    status: 'error' | 'failure' | 'unknown';
 }
 
 // @public (undocumented)
 export interface DaVinciErrorCacheEntry<T> {
-  // (undocumented)
-  endpointName: 'next' | 'flow' | 'start';
-  // (undocumented)
-  error: {
-    data: T;
-  };
-  // (undocumented)
-  fulfilledTimeStamp: number;
-  // (undocumented)
-  isError: boolean;
-  // (undocumented)
-  isLoading: boolean;
-  // (undocumented)
-  isSuccess: boolean;
-  // (undocumented)
-  isUninitialized: boolean;
-  // (undocumented)
-  requestId: string;
-  // (undocumented)
-  startedTimeStamp: number;
-  // (undocumented)
-  status: 'fulfilled' | 'pending' | 'rejected';
+    // (undocumented)
+    endpointName: 'next' | 'flow' | 'start';
+    // (undocumented)
+    error: {
+        data: T;
+    };
+    // (undocumented)
+    fulfilledTimeStamp: number;
+    // (undocumented)
+    isError: boolean;
+    // (undocumented)
+    isLoading: boolean;
+    // (undocumented)
+    isSuccess: boolean;
+    // (undocumented)
+    isUninitialized: boolean;
+    // (undocumented)
+    requestId: string;
+    // (undocumented)
+    startedTimeStamp: number;
+    // (undocumented)
+    status: 'fulfilled' | 'pending' | 'rejected';
 }
 
 // @public (undocumented)
 export interface DavinciErrorResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  cause?: string | null;
-  // (undocumented)
-  code: string | number;
-  // (undocumented)
-  details?: ErrorDetail[];
-  // (undocumented)
-  doNotSendToOE?: boolean;
-  // (undocumented)
-  error?: {
-    code?: string;
-    message?: string;
-  };
-  // (undocumented)
-  errorCategory?: string;
-  // (undocumented)
-  errorMessage?: string;
-  // (undocumented)
-  expected?: boolean;
-  // (undocumented)
-  httpResponseCode: number;
-  // (undocumented)
-  isErrorCustomized?: boolean;
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  metricAttributes?: {
-    [key: string]: unknown;
-  };
+    // (undocumented)
+    cause?: string | null;
+    // (undocumented)
+    code: string | number;
+    // (undocumented)
+    details?: ErrorDetail[];
+    // (undocumented)
+    doNotSendToOE?: boolean;
+    // (undocumented)
+    error?: {
+        code?: string;
+        message?: string;
+    };
+    // (undocumented)
+    errorCategory?: string;
+    // (undocumented)
+    errorMessage?: string;
+    // (undocumented)
+    expected?: boolean;
+    // (undocumented)
+    httpResponseCode: number;
+    // (undocumented)
+    isErrorCustomized?: boolean;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    metricAttributes?: {
+        [key: string]: unknown;
+    };
 }
 
 // @public (undocumented)
 export interface DaVinciFailureResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  error?: {
-    code?: string;
-    message?: string;
-    [key: string]: unknown;
-  };
+    // (undocumented)
+    error?: {
+        code?: string;
+        message?: string;
+        [key: string]: unknown;
+    };
 }
 
 // @public (undocumented)
-export type DaVinciField =
-  | ComplexValueFields
-  | MultiValueFields
-  | ReadOnlyFields
-  | RedirectFields
-  | SingleValueFields;
+export type DaVinciField = ComplexValueFields | MultiValueFields | ReadOnlyFields | RedirectFields | SingleValueFields;
 
 // @public
 export interface DaVinciNextResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  eventName?: string;
-  // (undocumented)
-  form?: {
-    name?: string;
-    description?: string;
-    components?: {
-      fields?: DaVinciField[];
+    // (undocumented)
+    eventName?: string;
+    // (undocumented)
+    form?: {
+        name?: string;
+        description?: string;
+        components?: {
+            fields?: DaVinciField[];
+        };
     };
-  };
-  // (undocumented)
-  formData?: {
-    value?: {
-      [key: string]: string;
+    // (undocumented)
+    formData?: {
+        value?: {
+            [key: string]: string;
+        };
     };
-  };
-  // (undocumented)
-  _links?: Links;
+    // (undocumented)
+    _links?: Links;
 }
 
 // @public
 export interface DaVinciPollResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  eventName?: string;
-  // (undocumented)
-  _links?: Links;
-  // (undocumented)
-  success?: boolean;
+    // (undocumented)
+    eventName?: string;
+    // (undocumented)
+    _links?: Links;
+    // (undocumented)
+    success?: boolean;
 }
 
 // @public (undocumented)
 export interface DaVinciRequest {
-  // (undocumented)
-  eventName: string;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  interactionId: string;
-  // (undocumented)
-  parameters: {
-    eventType: 'submit' | 'action' | 'polling';
-    data: {
-      actionKey: string;
-      formData?: Record<string, unknown>;
+    // (undocumented)
+    eventName: string;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    interactionId: string;
+    // (undocumented)
+    parameters: {
+        eventType: 'submit' | 'action' | 'polling';
+        data: {
+            actionKey: string;
+            formData?: Record<string, unknown>;
+        };
     };
-  };
 }
 
 // @public (undocumented)
 export interface DaVinciSuccessResponse extends DaVinciBaseResponse {
-  // (undocumented)
-  authorizeResponse?: OAuthDetails;
-  // (undocumented)
-  environment: {
-    id: string;
-    [key: string]: unknown;
-  };
-  // (undocumented)
-  _links?: Links;
-  // (undocumented)
-  resetCookie?: boolean;
-  // (undocumented)
-  session?: {
-    id?: string;
-    [key: string]: unknown;
-  };
-  // (undocumented)
-  sessionToken?: string;
-  // (undocumented)
-  sessionTokenMaxAge?: number;
-  // (undocumented)
-  status: string;
-  // (undocumented)
-  subFlowSettings?: {
-    cssLinks?: unknown[];
-    cssUrl?: unknown;
-    jsLinks?: unknown[];
-    loadingScreenSettings?: unknown;
-    reactSkUrl?: unknown;
-  };
-  // (undocumented)
-  success: true;
+    // (undocumented)
+    authorizeResponse?: OAuthDetails;
+    // (undocumented)
+    environment: {
+        id: string;
+        [key: string]: unknown;
+    };
+    // (undocumented)
+    _links?: Links;
+    // (undocumented)
+    resetCookie?: boolean;
+    // (undocumented)
+    session?: {
+        id?: string;
+        [key: string]: unknown;
+    };
+    // (undocumented)
+    sessionToken?: string;
+    // (undocumented)
+    sessionTokenMaxAge?: number;
+    // (undocumented)
+    status: string;
+    // (undocumented)
+    subFlowSettings?: {
+        cssLinks?: unknown[];
+        cssUrl?: unknown;
+        jsLinks?: unknown[];
+        loadingScreenSettings?: unknown;
+        reactSkUrl?: unknown;
+    };
+    // (undocumented)
+    success: true;
 }
 
 // @public (undocumented)
-export type DeviceAuthenticationCollector = ObjectOptionsCollectorWithObjectValue<
-  'DeviceAuthenticationCollector',
-  DeviceValue
->;
+export type DeviceAuthenticationCollector = ObjectOptionsCollectorWithObjectValue<'DeviceAuthenticationCollector', DeviceValue>;
 
 // @public (undocumented)
 export type DeviceAuthenticationField = {
-  type: 'DEVICE_AUTHENTICATION';
-  key: string;
-  label: string;
-  options: {
-    type: string;
-    iconSrc: string;
-    title: string;
-    id: string;
-    default: boolean;
-    description: string;
-  }[];
-  required: boolean;
+    type: 'DEVICE_AUTHENTICATION';
+    key: string;
+    label: string;
+    options: {
+        type: string;
+        iconSrc: string;
+        title: string;
+        id: string;
+        default: boolean;
+        description: string;
+    }[];
+    required: boolean;
 };
 
 // @public (undocumented)
 export interface DeviceOptionNoDefault {
-  // (undocumented)
-  content: string;
-  // (undocumented)
-  key: string;
-  // (undocumented)
-  label: string;
-  // (undocumented)
-  type: string;
-  // (undocumented)
-  value: string;
+    // (undocumented)
+    content: string;
+    // (undocumented)
+    key: string;
+    // (undocumented)
+    label: string;
+    // (undocumented)
+    type: string;
+    // (undocumented)
+    value: string;
 }
 
 // @public (undocumented)
 export interface DeviceOptionWithDefault {
-  // (undocumented)
-  content: string;
-  // (undocumented)
-  default: boolean;
-  // (undocumented)
-  key: string;
-  // (undocumented)
-  label: string;
-  // (undocumented)
-  type: string;
-  // (undocumented)
-  value: string;
+    // (undocumented)
+    content: string;
+    // (undocumented)
+    default: boolean;
+    // (undocumented)
+    key: string;
+    // (undocumented)
+    label: string;
+    // (undocumented)
+    type: string;
+    // (undocumented)
+    value: string;
 }
 
 // @public (undocumented)
-export type DeviceRegistrationCollector = ObjectOptionsCollectorWithStringValue<
-  'DeviceRegistrationCollector',
-  string
->;
+export type DeviceRegistrationCollector = ObjectOptionsCollectorWithStringValue<'DeviceRegistrationCollector', string>;
 
 // @public (undocumented)
 export type DeviceRegistrationField = {
-  type: 'DEVICE_REGISTRATION';
-  key: string;
-  label: string;
-  options: {
-    type: string;
-    iconSrc: string;
-    title: string;
-    description: string;
-  }[];
-  required: boolean;
+    type: 'DEVICE_REGISTRATION';
+    key: string;
+    label: string;
+    options: {
+        type: string;
+        iconSrc: string;
+        title: string;
+        description: string;
+    }[];
+    required: boolean;
 };
 
 // @public (undocumented)
 export interface DeviceValue {
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  type: string;
-  // (undocumented)
-  value: string;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    type: string;
+    // (undocumented)
+    value: string;
 }
 
 // @public (undocumented)
 export interface ErrorDetail {
-  // (undocumented)
-  message?: string;
-  // (undocumented)
-  rawResponse?: {
-    _embedded?: {
-      users?: Array<unknown>;
-    };
-    code?: string;
-    count?: number;
-    details?: NestedErrorDetails[];
-    id?: string;
+    // (undocumented)
     message?: string;
-    size?: number;
-    userFilter?: string;
-    [key: string]: unknown;
-  };
-  // (undocumented)
-  statusCode?: number;
+    // (undocumented)
+    rawResponse?: {
+        _embedded?: {
+            users?: Array<unknown>;
+        };
+        code?: string;
+        count?: number;
+        details?: NestedErrorDetails[];
+        id?: string;
+        message?: string;
+        size?: number;
+        userFilter?: string;
+        [key: string]: unknown;
+    };
+    // (undocumented)
+    statusCode?: number;
 }
 
 // @public (undocumented)
 export interface ErrorNode {
-  // (undocumented)
-  cache: {
-    key: string;
-  };
-  // (undocumented)
-  client: {
-    action: string;
-    collectors: Collectors[];
-    description?: string;
-    name?: string;
-    status: 'error';
-  };
-  // (undocumented)
-  error: DaVinciError;
-  // (undocumented)
-  httpStatus: number;
-  // (undocumented)
-  server: {
-    _links?: Links;
-    eventName?: string;
-    id?: string;
-    interactionId?: string;
-    interactionToken?: string;
+    // (undocumented)
+    cache: {
+        key: string;
+    };
+    // (undocumented)
+    client: {
+        action: string;
+        collectors: Collectors[];
+        description?: string;
+        name?: string;
+        status: 'error';
+    };
+    // (undocumented)
+    error: DaVinciError;
+    // (undocumented)
+    httpStatus: number;
+    // (undocumented)
+    server: {
+        _links?: Links;
+        eventName?: string;
+        id?: string;
+        interactionId?: string;
+        interactionToken?: string;
+        status: 'error';
+    } | null;
+    // (undocumented)
     status: 'error';
-  } | null;
-  // (undocumented)
-  status: 'error';
 }
 
 // @public (undocumented)
 export interface FailureNode {
-  // (undocumented)
-  cache: {
-    key: string;
-  };
-  // (undocumented)
-  client: {
-    status: 'failure';
-  };
-  // (undocumented)
-  error: DaVinciError;
-  // (undocumented)
-  httpStatus: number;
-  // (undocumented)
-  server: {
-    _links?: Links;
-    eventName?: string;
-    href?: string;
-    id?: string;
-    interactionId?: string;
-    interactionToken?: string;
+    // (undocumented)
+    cache: {
+        key: string;
+    };
+    // (undocumented)
+    client: {
+        status: 'failure';
+    };
+    // (undocumented)
+    error: DaVinciError;
+    // (undocumented)
+    httpStatus: number;
+    // (undocumented)
+    server: {
+        _links?: Links;
+        eventName?: string;
+        href?: string;
+        id?: string;
+        interactionId?: string;
+        interactionToken?: string;
+        status: 'failure';
+    } | null;
+    // (undocumented)
     status: 'failure';
-  } | null;
-  // (undocumented)
-  status: 'failure';
 }
 
 // @public (undocumented)
-export type FidoAuthenticationCollector = AutoCollector<
-  'ObjectValueAutoCollector',
-  'FidoAuthenticationCollector',
-  FidoAuthenticationInputValue,
-  FidoAuthenticationOutputValue
->;
+export type FidoAuthenticationCollector = AutoCollector<'ObjectValueAutoCollector', 'FidoAuthenticationCollector', FidoAuthenticationInputValue, FidoAuthenticationOutputValue>;
 
 // @public (undocumented)
 export type FidoAuthenticationField = {
-  type: 'FIDO2';
-  key: string;
-  label: string;
-  publicKeyCredentialRequestOptions: FidoAuthenticationOptions;
-  action: 'AUTHENTICATE';
-  trigger: string;
-  required: boolean;
+    type: 'FIDO2';
+    key: string;
+    label: string;
+    publicKeyCredentialRequestOptions: FidoAuthenticationOptions;
+    action: 'AUTHENTICATE';
+    trigger: string;
+    required: boolean;
 };
 
 // @public (undocumented)
 export interface FidoAuthenticationInputValue {
-  // (undocumented)
-  assertionValue?: AssertionValue;
+    // (undocumented)
+    assertionValue?: AssertionValue;
 }
 
 // @public (undocumented)
-export interface FidoAuthenticationOptions extends Omit<
-  PublicKeyCredentialRequestOptions,
-  'challenge' | 'allowCredentials'
-> {
-  // (undocumented)
-  allowCredentials?: {
-    id: number[];
-    transports?: AuthenticatorTransport[];
-    type: PublicKeyCredentialType;
-  }[];
-  // (undocumented)
-  challenge: number[];
+export interface FidoAuthenticationOptions extends Omit<PublicKeyCredentialRequestOptions, 'challenge' | 'allowCredentials'> {
+    // (undocumented)
+    allowCredentials?: {
+        id: number[];
+        transports?: AuthenticatorTransport[];
+        type: PublicKeyCredentialType;
+    }[];
+    // (undocumented)
+    challenge: number[];
 }
 
 // @public (undocumented)
 export interface FidoAuthenticationOutputValue {
-  // (undocumented)
-  action: 'AUTHENTICATE';
-  // (undocumented)
-  publicKeyCredentialRequestOptions: FidoAuthenticationOptions;
-  // (undocumented)
-  trigger: string;
+    // (undocumented)
+    action: 'AUTHENTICATE';
+    // (undocumented)
+    publicKeyCredentialRequestOptions: FidoAuthenticationOptions;
+    // (undocumented)
+    trigger: string;
 }
 
 // @public (undocumented)
 export interface FidoClient {
-  authenticate: (
-    options: FidoAuthenticationOptions,
-  ) => Promise<FidoAuthenticationInputValue | GenericError>;
-  register: (
-    options: FidoRegistrationOptions,
-  ) => Promise<FidoRegistrationInputValue | GenericError>;
+    authenticate: (options: FidoAuthenticationOptions) => Promise<FidoAuthenticationInputValue | GenericError>;
+    register: (options: FidoRegistrationOptions) => Promise<FidoRegistrationInputValue | GenericError>;
 }
 
 // @public (undocumented)
-export type FidoRegistrationCollector = AutoCollector<
-  'ObjectValueAutoCollector',
-  'FidoRegistrationCollector',
-  FidoRegistrationInputValue,
-  FidoRegistrationOutputValue
->;
+export type FidoRegistrationCollector = AutoCollector<'ObjectValueAutoCollector', 'FidoRegistrationCollector', FidoRegistrationInputValue, FidoRegistrationOutputValue>;
 
 // @public (undocumented)
 export type FidoRegistrationField = {
-  type: 'FIDO2';
-  key: string;
-  label: string;
-  publicKeyCredentialCreationOptions: FidoRegistrationOptions;
-  action: 'REGISTER';
-  trigger: string;
-  required: boolean;
+    type: 'FIDO2';
+    key: string;
+    label: string;
+    publicKeyCredentialCreationOptions: FidoRegistrationOptions;
+    action: 'REGISTER';
+    trigger: string;
+    required: boolean;
 };
 
 // @public (undocumented)
 export interface FidoRegistrationInputValue {
-  // (undocumented)
-  attestationValue?: AttestationValue;
-}
-
-// @public (undocumented)
-export interface FidoRegistrationOptions extends Omit<
-  PublicKeyCredentialCreationOptions,
-  'challenge' | 'user' | 'pubKeyCredParams' | 'excludeCredentials'
-> {
-  // (undocumented)
-  challenge: number[];
-  // (undocumented)
-  excludeCredentials?: {
-    id: number[];
-    transports?: AuthenticatorTransport[];
-    type: PublicKeyCredentialType;
-  }[];
-  // (undocumented)
-  pubKeyCredParams: {
-    alg: string | number;
-    type: PublicKeyCredentialType;
-  }[];
-  // (undocumented)
-  user: {
-    id: number[];
-    name: string;
-    displayName: string;
-  };
+    // (undocumented)
+    attestationValue?: AttestationValue;
+}
+
+// @public (undocumented)
+export interface FidoRegistrationOptions extends Omit<PublicKeyCredentialCreationOptions, 'challenge' | 'user' | 'pubKeyCredParams' | 'excludeCredentials'> {
+    // (undocumented)
+    challenge: number[];
+    // (undocumented)
+    excludeCredentials?: {
+        id: number[];
+        transports?: AuthenticatorTransport[];
+        type: PublicKeyCredentialType;
+    }[];
+    // (undocumented)
+    pubKeyCredParams: {
+        alg: string | number;
+        type: PublicKeyCredentialType;
+    }[];
+    // (undocumented)
+    user: {
+        id: number[];
+        name: string;
+        displayName: string;
+    };
 }
 
 // @public (undocumented)
 export interface FidoRegistrationOutputValue {
-  // (undocumented)
-  action: 'REGISTER';
-  // (undocumented)
-  publicKeyCredentialCreationOptions: FidoRegistrationOptions;
-  // (undocumented)
-  trigger: string;
+    // (undocumented)
+    action: 'REGISTER';
+    // (undocumented)
+    publicKeyCredentialCreationOptions: FidoRegistrationOptions;
+    // (undocumented)
+    trigger: string;
 }
 
 // @public (undocumented)
@@ -1354,195 +1011,132 @@ export type FlowCollector = ActionCollectorNoUrl<'FlowCollector'>;
 export type FlowNode = ContinueNode | ErrorNode | StartNode | SuccessNode | FailureNode;
 
 // @public
-export type GetClient =
-  | StartNode['client']
-  | ContinueNode['client']
-  | ErrorNode['client']
-  | SuccessNode['client']
-  | FailureNode['client'];
+export type GetClient = StartNode['client'] | ContinueNode['client'] | ErrorNode['client'] | SuccessNode['client'] | FailureNode['client'];
 
 // @public (undocumented)
 export type IdpCollector = ActionCollectorWithUrl<'IdpCollector'>;
 
 // @public (undocumented)
-export type InferActionCollectorType<T extends ActionCollectorTypes> = T extends 'IdpCollector'
-  ? IdpCollector
-  : T extends 'SubmitCollector'
-    ? SubmitCollector
-    : T extends 'FlowCollector'
-      ? FlowCollector
-      : ActionCollectorWithUrl<'ActionCollector'> | ActionCollectorNoUrl<'ActionCollector'>;
+export type InferActionCollectorType<T extends ActionCollectorTypes> = T extends 'IdpCollector' ? IdpCollector : T extends 'SubmitCollector' ? SubmitCollector : T extends 'FlowCollector' ? FlowCollector : ActionCollectorWithUrl<'ActionCollector'> | ActionCollectorNoUrl<'ActionCollector'>;
 
 // @public
-export type InferAutoCollectorType<T extends AutoCollectorTypes> = T extends 'ProtectCollector'
-  ? ProtectCollector
-  : T extends 'PollingCollector'
-    ? PollingCollector
-    : T extends 'FidoRegistrationCollector'
-      ? FidoRegistrationCollector
-      : T extends 'FidoAuthenticationCollector'
-        ? FidoAuthenticationCollector
-        : T extends 'ObjectValueAutoCollector'
-          ? ObjectValueAutoCollector
-          : SingleValueAutoCollector;
+export type InferAutoCollectorType<T extends AutoCollectorTypes> = T extends 'ProtectCollector' ? ProtectCollector : T extends 'PollingCollector' ? PollingCollector : T extends 'FidoRegistrationCollector' ? FidoRegistrationCollector : T extends 'FidoAuthenticationCollector' ? FidoAuthenticationCollector : T extends 'ObjectValueAutoCollector' ? ObjectValueAutoCollector : SingleValueAutoCollector;
 
 // @public
-export type InferMultiValueCollectorType<T extends MultiValueCollectorTypes> =
-  T extends 'MultiSelectCollector'
-    ? MultiValueCollectorWithValue<'MultiSelectCollector'>
-    :
-        | MultiValueCollectorWithValue<'MultiValueCollector'>
-        | MultiValueCollectorNoValue<'MultiValueCollector'>;
+export type InferMultiValueCollectorType<T extends MultiValueCollectorTypes> = T extends 'MultiSelectCollector' ? MultiValueCollectorWithValue<'MultiSelectCollector'> : MultiValueCollectorWithValue<'MultiValueCollector'> | MultiValueCollectorNoValue<'MultiValueCollector'>;
 
 // @public
-export type InferNoValueCollectorType<T extends NoValueCollectorTypes> =
-  T extends 'ReadOnlyCollector'
-    ? ReadOnlyCollector
-    : T extends 'RichTextCollector'
-      ? RichTextCollector
-      : T extends 'QrCodeCollector'
-        ? QrCodeCollector
-        : T extends 'AgreementCollector'
-          ? AgreementCollector
-          : NoValueCollectorBase<'NoValueCollector'>;
+export type InferNoValueCollectorType<T extends NoValueCollectorTypes> = T extends 'ReadOnlyCollector' ? NoValueCollectorBase<'ReadOnlyCollector'> : T extends 'QrCodeCollector' ? QrCodeCollectorBase : T extends 'AgreementCollector' ? AgreementCollector : NoValueCollectorBase<'NoValueCollector'>;
 
 // @public
-export type InferSingleValueCollectorType<T extends SingleValueCollectorTypes> =
-  T extends 'TextCollector'
-    ? TextCollector
-    : T extends 'SingleSelectCollector'
-      ? SingleSelectCollector
-      : T extends 'ValidatedTextCollector'
-        ? ValidatedTextCollector
-        : T extends 'PasswordCollector'
-          ? PasswordCollector
-          : T extends 'ValidatedPasswordCollector'
-            ? ValidatedPasswordCollector
-            :
-                | SingleValueCollectorWithValue<'SingleValueCollector'>
-                | SingleValueCollectorNoValue<'SingleValueCollector'>;
-
-// @public (undocumented)
-export type InferValueObjectCollectorType<T extends ObjectValueCollectorTypes> =
-  T extends 'DeviceAuthenticationCollector'
-    ? DeviceAuthenticationCollector
-    : T extends 'DeviceRegistrationCollector'
-      ? DeviceRegistrationCollector
-      : T extends 'PhoneNumberCollector'
-        ? PhoneNumberCollector
-        : T extends 'PhoneNumberExtensionCollector'
-          ? PhoneNumberExtensionCollector
-          :
-              | ObjectOptionsCollectorWithObjectValue<'ObjectValueCollector'>
-              | ObjectOptionsCollectorWithStringValue<'ObjectValueCollector'>;
+export type InferSingleValueCollectorType<T extends SingleValueCollectorTypes> = T extends 'TextCollector' ? TextCollector : T extends 'SingleSelectCollector' ? SingleSelectCollector : T extends 'ValidatedTextCollector' ? ValidatedTextCollector : T extends 'PasswordCollector' ? PasswordCollector : SingleValueCollectorWithValue<'SingleValueCollector'> | SingleValueCollectorNoValue<'SingleValueCollector'>;
+
+// @public (undocumented)
+export type InferValueObjectCollectorType<T extends ObjectValueCollectorTypes> = T extends 'DeviceAuthenticationCollector' ? DeviceAuthenticationCollector : T extends 'DeviceRegistrationCollector' ? DeviceRegistrationCollector : T extends 'PhoneNumberCollector' ? PhoneNumberCollector : ObjectOptionsCollectorWithObjectValue<'ObjectValueCollector'> | ObjectOptionsCollectorWithStringValue<'ObjectValueCollector'>;
 
 // @public (undocumented)
 export type InitFlow = () => Promise<FlowNode | InternalErrorResponse>;
 
 // @public (undocumented)
 export interface InternalErrorResponse {
-  // (undocumented)
-  error: Omit<GenericError, 'error'> & {
-    message: string;
-  };
-  // (undocumented)
-  type: 'internal_error';
+    // (undocumented)
+    error: Omit<GenericError, 'error'> & {
+        message: string;
+    };
+    // (undocumented)
+    type: 'internal_error';
 }
 
 // @public (undocumented)
 export interface Links {
-  // (undocumented)
-  [key: string]: {
-    href?: string;
-  };
+    // (undocumented)
+    [key: string]: {
+        href?: string;
+    };
 }
 
-export { LogLevel };
+export { LogLevel }
 
 // @public (undocumented)
 export type MultiSelectCollector = MultiValueCollectorWithValue<'MultiSelectCollector'>;
 
 // @public (undocumented)
 export type MultiSelectField = {
-  inputType: 'MULTI_SELECT';
-  key: string;
-  label: string;
-  options: {
+    inputType: 'MULTI_SELECT';
+    key: string;
     label: string;
-    value: string;
-  }[];
-  required?: boolean;
-  type: 'CHECKBOX' | 'COMBOBOX';
+    options: {
+        label: string;
+        value: string;
+    }[];
+    required?: boolean;
+    type: 'CHECKBOX' | 'COMBOBOX';
 };
 
 // @public (undocumented)
-export type MultiValueCollector<T extends MultiValueCollectorTypes> =
-  | MultiValueCollectorWithValue<T>
-  | MultiValueCollectorNoValue<T>;
+export type MultiValueCollector<T extends MultiValueCollectorTypes> = MultiValueCollectorWithValue<T> | MultiValueCollectorNoValue<T>;
 
 // @public (undocumented)
 export interface MultiValueCollectorNoValue<T extends MultiValueCollectorTypes> {
-  // (undocumented)
-  category: 'MultiValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string[];
-    type: string;
-    validation: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    options: SelectorOption[];
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'MultiValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string[];
+        type: string;
+        validation: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        options: SelectorOption[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type MultiValueCollectors =
-  | MultiValueCollectorWithValue<'MultiValueCollector'>
-  | MultiValueCollectorWithValue<'MultiSelectCollector'>;
+export type MultiValueCollectors = MultiValueCollectorWithValue<'MultiValueCollector'> | MultiValueCollectorWithValue<'MultiSelectCollector'>;
 
 // @public
 export type MultiValueCollectorTypes = 'MultiSelectCollector' | 'MultiValueCollector';
 
 // @public (undocumented)
 export interface MultiValueCollectorWithValue<T extends MultiValueCollectorTypes> {
-  // (undocumented)
-  category: 'MultiValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string[];
-    type: string;
-    validation: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value: string[];
-    options: SelectorOption[];
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'MultiValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string[];
+        type: string;
+        validation: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value: string[];
+        options: SelectorOption[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
@@ -1550,563 +1144,314 @@ export type MultiValueFields = MultiSelectField;
 
 // @public
 export interface NestedErrorDetails {
-  // (undocumented)
-  code?: string;
-  // (undocumented)
-  innerError?: {
-    history?: string;
-    unsatisfiedRequirements?: string[];
-    failuresRemaining?: number;
-  };
-  // (undocumented)
-  message?: string;
-  // (undocumented)
-  target?: string;
+    // (undocumented)
+    code?: string;
+    // (undocumented)
+    innerError?: {
+        history?: string;
+        unsatisfiedRequirements?: string[];
+        failuresRemaining?: number;
+    };
+    // (undocumented)
+    message?: string;
+    // (undocumented)
+    target?: string;
 }
 
 // @public
-export const nextCollectorValues: ActionCreatorWithPayload<
-  {
-    fields: DaVinciField[];
-    formData: {
-      value: Record<string, unknown>;
-    };
-  },
-  string
->;
+export const nextCollectorValues: ActionCreatorWithPayload<    {
+fields: DaVinciField[];
+formData: {
+value: Record<string, unknown>;
+};
+}, string>;
 
 // @public
-export const nodeCollectorReducer: Reducer<
-  (
-    | TextCollector
-    | SingleSelectCollector
-    | ValidatedTextCollector
-    | PasswordCollector
-    | ValidatedPasswordCollector
-    | MultiSelectCollector
-    | PhoneNumberExtensionCollector
-    | DeviceAuthenticationCollector
-    | DeviceRegistrationCollector
-    | PhoneNumberCollector
-    | IdpCollector
-    | SubmitCollector
-    | FlowCollector
-    | QrCodeCollector
-    | ReadOnlyCollector
-    | RichTextCollector
-    | AgreementCollector
-    | UnknownCollector
-    | ProtectCollector
-    | FidoRegistrationCollector
-    | FidoAuthenticationCollector
-    | PollingCollector
-    | ActionCollector<'ActionCollector'>
-    | SingleValueCollector<'SingleValueCollector'>
-  )[]
-> & {
-  getInitialState: () => (
-    | TextCollector
-    | SingleSelectCollector
-    | ValidatedTextCollector
-    | PasswordCollector
-    | ValidatedPasswordCollector
-    | MultiSelectCollector
-    | PhoneNumberExtensionCollector
-    | DeviceAuthenticationCollector
-    | DeviceRegistrationCollector
-    | PhoneNumberCollector
-    | IdpCollector
-    | SubmitCollector
-    | FlowCollector
-    | QrCodeCollector
-    | ReadOnlyCollector
-    | RichTextCollector
-    | AgreementCollector
-    | UnknownCollector
-    | ProtectCollector
-    | FidoRegistrationCollector
-    | FidoAuthenticationCollector
-    | PollingCollector
-    | ActionCollector<'ActionCollector'>
-    | SingleValueCollector<'SingleValueCollector'>
-  )[];
+export const nodeCollectorReducer: Reducer<(TextCollector | SingleSelectCollector | ValidatedTextCollector | PasswordCollector | MultiSelectCollector | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector | IdpCollector | SubmitCollector | FlowCollector | QrCodeCollectorBase | AgreementCollector | ReadOnlyCollector | UnknownCollector | ProtectCollector | FidoRegistrationCollector | FidoAuthenticationCollector | PollingCollector | ActionCollector<"ActionCollector"> | SingleValueCollector<"SingleValueCollector">)[]> & {
+    getInitialState: () => (TextCollector | SingleSelectCollector | ValidatedTextCollector | PasswordCollector | MultiSelectCollector | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector | IdpCollector | SubmitCollector | FlowCollector | QrCodeCollectorBase | AgreementCollector | ReadOnlyCollector | UnknownCollector | ProtectCollector | FidoRegistrationCollector | FidoAuthenticationCollector | PollingCollector | ActionCollector<"ActionCollector"> | SingleValueCollector<"SingleValueCollector">)[];
 };
 
 // @public (undocumented)
 export type NodeStates = StartNode | ContinueNode | ErrorNode | SuccessNode | FailureNode;
 
 // @public (undocumented)
-export type NoValueCollector<T extends NoValueCollectorTypes> = InferNoValueCollectorType<T>;
+export type NoValueCollector<T extends NoValueCollectorTypes> = NoValueCollectorBase<T>;
 
 // @public (undocumented)
 export interface NoValueCollectorBase<T extends NoValueCollectorTypes> {
-  // (undocumented)
-  category: 'NoValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'NoValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type NoValueCollectors =
-  | NoValueCollectorBase<'NoValueCollector'>
-  | ReadOnlyCollector
-  | RichTextCollector
-  | QrCodeCollector
-  | AgreementCollector;
+export type NoValueCollectors = NoValueCollectorBase<'NoValueCollector'> | NoValueCollectorBase<'ReadOnlyCollector'> | QrCodeCollectorBase | AgreementCollector;
 
 // @public
-export type NoValueCollectorTypes =
-  | 'ReadOnlyCollector'
-  | 'RichTextCollector'
-  | 'NoValueCollector'
-  | 'QrCodeCollector'
-  | 'AgreementCollector';
+export type NoValueCollectorTypes = 'ReadOnlyCollector' | 'NoValueCollector' | 'QrCodeCollector' | 'AgreementCollector';
 
 // @public
 export interface OAuthDetails {
-  // (undocumented)
-  [key: string]: unknown;
-  // (undocumented)
-  code?: string;
-  // (undocumented)
-  state?: string;
+    // (undocumented)
+    [key: string]: unknown;
+    // (undocumented)
+    code?: string;
+    // (undocumented)
+    state?: string;
 }
 
 // @public (undocumented)
-export interface ObjectOptionsCollectorWithObjectValue<
-  T extends ObjectValueCollectorTypes,
-  V = Record<string, string>,
-  D = Record<string, string>,
-> {
-  // (undocumented)
-  category: 'ObjectValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: V;
-    type: string;
-    validation: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    options: DeviceOptionWithDefault[];
-    value?: D | null;
-  };
-  // (undocumented)
-  type: T;
+export interface ObjectOptionsCollectorWithObjectValue<T extends ObjectValueCollectorTypes, V = Record<string, string>, D = Record<string, string>> {
+    // (undocumented)
+    category: 'ObjectValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: V;
+        type: string;
+        validation: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        options: DeviceOptionWithDefault[];
+        value?: D | null;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export interface ObjectOptionsCollectorWithStringValue<
-  T extends ObjectValueCollectorTypes,
-  V = string,
-> {
-  // (undocumented)
-  category: 'ObjectValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: V;
-    type: string;
-    validation: ValidationRequired[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    options: DeviceOptionNoDefault[];
-  };
-  // (undocumented)
-  type: T;
+export interface ObjectOptionsCollectorWithStringValue<T extends ObjectValueCollectorTypes, V = string> {
+    // (undocumented)
+    category: 'ObjectValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: V;
+        type: string;
+        validation: ValidationRequired[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        options: DeviceOptionNoDefault[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type ObjectValueAutoCollector = AutoCollector<
-  'ObjectValueAutoCollector',
-  'ObjectValueAutoCollector',
-  Record<string, unknown>
->;
+export type ObjectValueAutoCollector = AutoCollector<'ObjectValueAutoCollector', 'ObjectValueAutoCollector', Record<string, unknown>>;
 
 // @public (undocumented)
-export type ObjectValueAutoCollectorTypes =
-  | 'ObjectValueAutoCollector'
-  | 'FidoRegistrationCollector'
-  | 'FidoAuthenticationCollector';
+export type ObjectValueAutoCollectorTypes = 'ObjectValueAutoCollector' | 'FidoRegistrationCollector' | 'FidoAuthenticationCollector';
 
 // @public (undocumented)
-export type ObjectValueCollector<T extends ObjectValueCollectorTypes> =
-  | ObjectOptionsCollectorWithObjectValue<T>
-  | ObjectOptionsCollectorWithStringValue<T>
-  | ObjectValueCollectorWithObjectValue<T>;
+export type ObjectValueCollector<T extends ObjectValueCollectorTypes> = ObjectOptionsCollectorWithObjectValue<T> | ObjectOptionsCollectorWithStringValue<T> | ObjectValueCollectorWithObjectValue<T>;
 
 // @public (undocumented)
-export type ObjectValueCollectors =
-  | DeviceAuthenticationCollector
-  | DeviceRegistrationCollector
-  | PhoneNumberCollector
-  | PhoneNumberExtensionCollector
-  | ObjectOptionsCollectorWithObjectValue<'ObjectSelectCollector'>
-  | ObjectOptionsCollectorWithStringValue<'ObjectSelectCollector'>;
+export type ObjectValueCollectors = DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector | ObjectOptionsCollectorWithObjectValue<'ObjectSelectCollector'> | ObjectOptionsCollectorWithStringValue<'ObjectSelectCollector'>;
 
 // @public
-export type ObjectValueCollectorTypes =
-  | 'DeviceAuthenticationCollector'
-  | 'DeviceRegistrationCollector'
-  | 'PhoneNumberCollector'
-  | 'PhoneNumberExtensionCollector'
-  | 'ObjectOptionsCollector'
-  | 'ObjectValueCollector'
-  | 'ObjectSelectCollector';
-
-// @public (undocumented)
-export interface ObjectValueCollectorWithObjectValue<
-  T extends ObjectValueCollectorTypes,
-  IV = Record<string, string>,
-  OV = Record<string, string>,
-> {
-  // (undocumented)
-  category: 'ObjectValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: IV;
-    type: string;
-    validation: (ValidationRequired | ValidationPhoneNumber)[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value?: OV | null;
-  };
-  // (undocumented)
-  type: T;
-}
+export type ObjectValueCollectorTypes = 'DeviceAuthenticationCollector' | 'DeviceRegistrationCollector' | 'PhoneNumberCollector' | 'ObjectOptionsCollector' | 'ObjectValueCollector' | 'ObjectSelectCollector';
 
 // @public (undocumented)
-export interface OutgoingQueryParams {
-  // (undocumented)
-  [key: string]: string | string[];
+export interface ObjectValueCollectorWithObjectValue<T extends ObjectValueCollectorTypes, IV = Record<string, string>, OV = Record<string, string>> {
+    // (undocumented)
+    category: 'ObjectValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: IV;
+        type: string;
+        validation: (ValidationRequired | ValidationPhoneNumber)[] | null;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value?: OV | null;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export interface PasswordCollector {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    verify: boolean;
-  };
-  // (undocumented)
-  type: 'PasswordCollector';
+export interface OutgoingQueryParams {
+    // (undocumented)
+    [key: string]: string | string[];
 }
 
-// @public
-export type PasswordField = {
-  type: 'PASSWORD' | 'PASSWORD_VERIFY';
-  key: string;
-  label: string;
-  required?: boolean;
-  verify?: boolean;
-  passwordPolicy?: PasswordPolicy;
-};
-
 // @public (undocumented)
-export interface PasswordPolicy {
-  // (undocumented)
-  createdAt?: string;
-  // (undocumented)
-  default?: boolean;
-  // (undocumented)
-  description?: string;
-  // (undocumented)
-  excludesCommonlyUsed?: boolean;
-  // (undocumented)
-  excludesProfileData?: boolean;
-  // (undocumented)
-  history?: {
-    count?: number;
-    retentionDays?: number;
-  };
-  // (undocumented)
-  id?: string;
-  // (undocumented)
-  length?: {
-    min?: number;
-    max?: number;
-  };
-  // (undocumented)
-  lockout?: {
-    failureCount?: number;
-    durationSeconds?: number;
-  };
-  // (undocumented)
-  maxAgeDays?: number;
-  // (undocumented)
-  maxRepeatedCharacters?: number;
-  // (undocumented)
-  minAgeDays?: number;
-  // (undocumented)
-  minCharacters?: Record<string, number>;
-  // (undocumented)
-  minUniqueCharacters?: number;
-  // (undocumented)
-  name?: string;
-  // (undocumented)
-  notSimilarToCurrent?: boolean;
-  // (undocumented)
-  populationCount?: number;
-  // (undocumented)
-  updatedAt?: string;
-}
+export type PasswordCollector = SingleValueCollectorNoValue<'PasswordCollector'>;
 
 // @public (undocumented)
-export type PhoneNumberCollector = ObjectValueCollectorWithObjectValue<
-  'PhoneNumberCollector',
-  PhoneNumberInputValue,
-  PhoneNumberOutputValue
->;
+export type PhoneNumberCollector = ObjectValueCollectorWithObjectValue<'PhoneNumberCollector', PhoneNumberInputValue, PhoneNumberOutputValue>;
 
 // @public (undocumented)
-export interface PhoneNumberExtensionCollector {
-  // (undocumented)
-  category: 'ObjectValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: PhoneNumberExtensionInputValue;
-    type: string;
-    validation: (ValidationRequired | ValidationPhoneNumber)[] | null;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
+export type PhoneNumberField = {
+    type: 'PHONE_NUMBER';
     key: string;
     label: string;
-    type: string;
-    extensionLabel: string;
-    value: PhoneNumberExtensionOutputValue;
-  };
-  // (undocumented)
-  type: 'PhoneNumberExtensionCollector';
-}
-
-// @public (undocumented)
-export type PhoneNumberExtensionField = PhoneNumberField & {
-  showExtension: boolean;
-  extensionLabel: string;
-};
-
-// @public (undocumented)
-export interface PhoneNumberExtensionInputValue {
-  // (undocumented)
-  countryCode: string;
-  // (undocumented)
-  extension: string;
-  // (undocumented)
-  phoneNumber: string;
-}
-
-// @public (undocumented)
-export interface PhoneNumberExtensionOutputValue {
-  // (undocumented)
-  countryCode?: string;
-  // (undocumented)
-  extension?: string;
-  // (undocumented)
-  phoneNumber?: string;
-}
-
-// @public (undocumented)
-export type PhoneNumberField = {
-  type: 'PHONE_NUMBER';
-  key: string;
-  label: string;
-  required: boolean;
-  defaultCountryCode: string | null;
-  validatePhoneNumber: boolean;
+    defaultCountryCode: string | null;
+    required: boolean;
+    validatePhoneNumber: boolean;
 };
 
 // @public (undocumented)
 export interface PhoneNumberInputValue {
-  // (undocumented)
-  countryCode: string;
-  // (undocumented)
-  phoneNumber: string;
+    // (undocumented)
+    countryCode: string;
+    // (undocumented)
+    phoneNumber: string;
 }
 
 // @public (undocumented)
 export interface PhoneNumberOutputValue {
-  // (undocumented)
-  countryCode?: string;
-  // (undocumented)
-  phoneNumber?: string;
+    // (undocumented)
+    countryCode?: string;
+    // (undocumented)
+    phoneNumber?: string;
 }
 
 // @public (undocumented)
 export type Poller = () => Promise<PollingStatus | InternalErrorResponse>;
 
 // @public (undocumented)
-export type PollingCollector = AutoCollector<
-  'SingleValueAutoCollector',
-  'PollingCollector',
-  string,
-  PollingOutputValue
->;
+export type PollingCollector = AutoCollector<'SingleValueAutoCollector', 'PollingCollector', string, PollingOutputValue>;
 
 // @public (undocumented)
 export type PollingField = {
-  type: 'POLLING';
-  key: string;
-  pollInterval: number;
-  pollRetries: number;
-  pollChallengeStatus?: boolean;
-  challenge?: string;
+    type: 'POLLING';
+    key: string;
+    pollInterval: number;
+    pollRetries: number;
+    pollChallengeStatus?: boolean;
+    challenge?: string;
 };
 
 // @public (undocumented)
 export interface PollingOutputValue {
-  // (undocumented)
-  challenge?: string;
-  // (undocumented)
-  pollChallengeStatus?: boolean;
-  // (undocumented)
-  pollInterval: number;
-  // (undocumented)
-  pollRetries: number;
-  // (undocumented)
-  retriesRemaining?: number;
+    // (undocumented)
+    challenge?: string;
+    // (undocumented)
+    pollChallengeStatus?: boolean;
+    // (undocumented)
+    pollInterval: number;
+    // (undocumented)
+    pollRetries: number;
+    // (undocumented)
+    retriesRemaining?: number;
 }
 
 // @public (undocumented)
 export type PollingStatus = PollingStatusContinue | PollingStatusChallenge;
 
 // @public (undocumented)
-export type PollingStatusChallenge =
-  | PollingStatusChallengeComplete
-  | 'expired'
-  | 'timedOut'
-  | 'error';
+export type PollingStatusChallenge = PollingStatusChallengeComplete | 'expired' | 'timedOut' | 'error';
 
 // @public (undocumented)
-export type PollingStatusChallengeComplete =
-  | 'approved'
-  | 'denied'
-  | 'continue'
-  | CustomPollingStatus;
+export type PollingStatusChallengeComplete = 'approved' | 'denied' | 'continue' | CustomPollingStatus;
 
 // @public (undocumented)
 export type PollingStatusContinue = 'continue' | 'timedOut';
 
 // @public (undocumented)
-export type ProtectCollector = AutoCollector<
-  'SingleValueAutoCollector',
-  'ProtectCollector',
-  string,
-  ProtectOutputValue
->;
+export type ProtectCollector = AutoCollector<'SingleValueAutoCollector', 'ProtectCollector', string, ProtectOutputValue>;
 
 // @public (undocumented)
 export type ProtectField = {
-  type: 'PROTECT';
-  key: string;
-  behavioralDataCollection: boolean;
-  universalDeviceIdentification: boolean;
+    type: 'PROTECT';
+    key: string;
+    behavioralDataCollection: boolean;
+    universalDeviceIdentification: boolean;
 };
 
 // @public
 export interface ProtectOutputValue {
-  // (undocumented)
-  behavioralDataCollection: boolean;
-  // (undocumented)
-  universalDeviceIdentification: boolean;
+    // (undocumented)
+    behavioralDataCollection: boolean;
+    // (undocumented)
+    universalDeviceIdentification: boolean;
 }
 
-// @public
-export interface QrCodeCollector extends NoValueCollectorBase<'QrCodeCollector'> {
-  // (undocumented)
-  output: NoValueCollectorBase<'QrCodeCollector'>['output'] & {
-    src: string;
-  };
+// @public (undocumented)
+export type QrCodeCollector = QrCodeCollectorBase;
+
+// @public (undocumented)
+export interface QrCodeCollectorBase {
+    // (undocumented)
+    category: 'NoValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        src: string;
+    };
+    // (undocumented)
+    type: 'QrCodeCollector';
 }
 
 // @public (undocumented)
 export type QrCodeField = {
-  type: 'QR_CODE';
-  key: string;
-  content: string;
-  fallbackText?: string;
+    type: 'QR_CODE';
+    key: string;
+    content: string;
+    fallbackText?: string;
 };
 
-// @public
-export interface ReadOnlyCollector extends NoValueCollectorBase<'ReadOnlyCollector'> {
-  // (undocumented)
-  output: NoValueCollectorBase<'ReadOnlyCollector'>['output'] & {
-    content: string;
-  };
-}
+// @public (undocumented)
+export type ReadOnlyCollector = NoValueCollectorBase<'ReadOnlyCollector'>;
 
-// @public
+// @public (undocumented)
 export type ReadOnlyField = {
-  type: 'LABEL';
-  content: string;
-  richContent?: RichContent;
-  key?: string;
+    type: 'LABEL';
+    content: string;
+    key?: string;
 };
 
 // @public (undocumented)
@@ -2114,60 +1459,23 @@ export type ReadOnlyFields = ReadOnlyField | QrCodeField | AgreementField;
 
 // @public (undocumented)
 export type RedirectField = {
-  type: 'SOCIAL_LOGIN_BUTTON';
-  key: string;
-  label: string;
-  links: Links;
+    type: 'SOCIAL_LOGIN_BUTTON';
+    key: string;
+    label: string;
+    links: Links;
 };
 
 // @public (undocumented)
 export type RedirectFields = RedirectField;
 
-export { RequestMiddleware };
-
-// @public
-export type RichContent = {
-  content: string;
-  replacements?: Record<string, RichContentReplacement>;
-};
-
-// @public
-export interface RichContentLink {
-  // (undocumented)
-  href: string;
-  // (undocumented)
-  key: string;
-  // (undocumented)
-  target?: '_self' | '_blank';
-  // (undocumented)
-  type: 'link';
-  // (undocumented)
-  value: string;
-}
-
-// @public
-export type RichContentReplacement = {
-  type: 'link';
-  value: string;
-  href: string;
-  target?: '_self' | '_blank';
-};
-
-// @public
-export interface RichTextCollector extends NoValueCollectorBase<'RichTextCollector'> {
-  // (undocumented)
-  output: NoValueCollectorBase<'RichTextCollector'>['output'] & {
-    content: string;
-    richContent: CollectorRichContent;
-  };
-}
+export { RequestMiddleware }
 
 // @public (undocumented)
 export interface SelectorOption {
-  // (undocumented)
-  label: string;
-  // (undocumented)
-  value: string;
+    // (undocumented)
+    label: string;
+    // (undocumented)
+    value: string;
 }
 
 // @public (undocumented)
@@ -2175,200 +1483,173 @@ export type SingleSelectCollector = SingleSelectCollectorWithValue<'SingleSelect
 
 // @public (undocumented)
 export interface SingleSelectCollectorNoValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    options: SelectorOption[];
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'SingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        options: SelectorOption[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
 export interface SingleSelectCollectorWithValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value: string | number | boolean;
-    options: SelectorOption[];
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'SingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value: string | number | boolean;
+        options: SelectorOption[];
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
 export type SingleSelectField = {
-  inputType: 'SINGLE_SELECT';
-  key: string;
-  label: string;
-  options: {
+    inputType: 'SINGLE_SELECT';
+    key: string;
     label: string;
-    value: string;
-  }[];
-  required?: boolean;
-  type: 'RADIO' | 'DROPDOWN';
+    options: {
+        label: string;
+        value: string;
+    }[];
+    required?: boolean;
+    type: 'RADIO' | 'DROPDOWN';
 };
 
 // @public (undocumented)
-export type SingleValueAutoCollector = AutoCollector<
-  'SingleValueAutoCollector',
-  'SingleValueAutoCollector',
-  string
->;
+export type SingleValueAutoCollector = AutoCollector<'SingleValueAutoCollector', 'SingleValueAutoCollector', string>;
 
 // @public (undocumented)
-export type SingleValueAutoCollectorTypes =
-  | 'SingleValueAutoCollector'
-  | 'ProtectCollector'
-  | 'PollingCollector';
+export type SingleValueAutoCollectorTypes = 'SingleValueAutoCollector' | 'ProtectCollector' | 'PollingCollector';
 
 // @public
-export type SingleValueCollector<T extends SingleValueCollectorTypes> =
-  | SingleValueCollectorWithValue<T>
-  | SingleValueCollectorNoValue<T>;
+export type SingleValueCollector<T extends SingleValueCollectorTypes> = SingleValueCollectorWithValue<T> | SingleValueCollectorNoValue<T>;
 
 // @public (undocumented)
 export interface SingleValueCollectorNoValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'SingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type SingleValueCollectors =
-  | PasswordCollector
-  | ValidatedPasswordCollector
-  | SingleSelectCollectorWithValue<'SingleSelectCollector'>
-  | SingleValueCollectorWithValue<'SingleValueCollector'>
-  | SingleValueCollectorWithValue<'TextCollector'>
-  | ValidatedSingleValueCollectorWithValue<'TextCollector'>;
+export type SingleValueCollectors = SingleValueCollectorNoValue<'PasswordCollector'> | SingleSelectCollectorWithValue<'SingleSelectCollector'> | SingleValueCollectorWithValue<'SingleValueCollector'> | SingleValueCollectorWithValue<'TextCollector'> | ValidatedSingleValueCollectorWithValue<'TextCollector'>;
 
 // @public
-export type SingleValueCollectorTypes =
-  | 'PasswordCollector'
-  | 'ValidatedPasswordCollector'
-  | 'SingleValueCollector'
-  | 'SingleSelectCollector'
-  | 'SingleSelectObjectCollector'
-  | 'TextCollector'
-  | 'ValidatedTextCollector';
+export type SingleValueCollectorTypes = 'PasswordCollector' | 'SingleValueCollector' | 'SingleSelectCollector' | 'SingleSelectObjectCollector' | 'TextCollector' | 'ValidatedTextCollector';
 
 // @public (undocumented)
 export interface SingleValueCollectorWithValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value: string | number | boolean;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'SingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value: string | number | boolean;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
-export type SingleValueFields =
-  | StandardField
-  | PasswordField
-  | ValidatedField
-  | SingleSelectField
-  | ProtectField;
+export type SingleValueFields = StandardField | ValidatedField | SingleSelectField | ProtectField;
 
 // @public (undocumented)
 export type StandardField = {
-  type: 'TEXT' | 'SUBMIT_BUTTON' | 'FLOW_BUTTON' | 'FLOW_LINK' | 'BUTTON';
-  key: string;
-  label: string;
-  required?: boolean;
+    type: 'PASSWORD' | 'PASSWORD_VERIFY' | 'TEXT' | 'SUBMIT_BUTTON' | 'FLOW_BUTTON' | 'FLOW_LINK' | 'BUTTON';
+    key: string;
+    label: string;
+    required?: boolean;
 };
 
 // @public (undocumented)
 export interface StartNode {
-  // (undocumented)
-  cache: null;
-  // (undocumented)
-  client: {
-    status: 'start';
-  };
-  // (undocumented)
-  error: DaVinciError | null;
-  // (undocumented)
-  server: {
+    // (undocumented)
+    cache: null;
+    // (undocumented)
+    client: {
+        status: 'start';
+    };
+    // (undocumented)
+    error: DaVinciError | null;
+    // (undocumented)
+    server: {
+        status: 'start';
+    };
+    // (undocumented)
     status: 'start';
-  };
-  // (undocumented)
-  status: 'start';
 }
 
 // @public (undocumented)
 export interface StartOptions<Query extends OutgoingQueryParams = OutgoingQueryParams> {
-  // (undocumented)
-  query: Query;
+    // (undocumented)
+    query: Query;
 }
 
 // @public (undocumented)
@@ -2376,35 +1657,35 @@ export type SubmitCollector = ActionCollectorNoUrl<'SubmitCollector'>;
 
 // @public (undocumented)
 export interface SuccessNode {
-  // (undocumented)
-  cache: {
-    key: string;
-  };
-  // (undocumented)
-  client: {
-    authorization?: {
-      code?: string;
-      state?: string;
+    // (undocumented)
+    cache: {
+        key: string;
     };
+    // (undocumented)
+    client: {
+        authorization?: {
+            code?: string;
+            state?: string;
+        };
+        status: 'success';
+    } | null;
+    // (undocumented)
+    error: null;
+    // (undocumented)
+    httpStatus: number;
+    // (undocumented)
+    server: {
+        _links?: Links;
+        eventName?: string;
+        id?: string;
+        interactionId?: string;
+        interactionToken?: string;
+        href?: string;
+        session?: string;
+        status: 'success';
+    };
+    // (undocumented)
     status: 'success';
-  } | null;
-  // (undocumented)
-  error: null;
-  // (undocumented)
-  httpStatus: number;
-  // (undocumented)
-  server: {
-    _links?: Links;
-    eventName?: string;
-    id?: string;
-    interactionId?: string;
-    interactionToken?: string;
-    href?: string;
-    session?: string;
-    status: 'success';
-  };
-  // (undocumented)
-  status: 'success';
 }
 
 // @public (undocumented)
@@ -2412,119 +1693,79 @@ export type TextCollector = SingleValueCollectorWithValue<'TextCollector'>;
 
 // @public (undocumented)
 export interface ThrownQueryError {
-  // (undocumented)
-  error: FetchBaseQueryError;
-  // (undocumented)
-  isHandledError: boolean;
-  // (undocumented)
-  meta: FetchBaseQueryMeta;
+    // (undocumented)
+    error: FetchBaseQueryError;
+    // (undocumented)
+    isHandledError: boolean;
+    // (undocumented)
+    meta: FetchBaseQueryMeta;
 }
 
 // @public
 export type UnknownCollector = {
-  category: 'UnknownCollector';
-  error: string | null;
-  type: 'UnknownCollector';
-  id: string;
-  name: string;
-  output: {
-    key: string;
-    label: string;
-    type: string;
-  };
+    category: 'UnknownCollector';
+    error: string | null;
+    type: 'UnknownCollector';
+    id: string;
+    name: string;
+    output: {
+        key: string;
+        label: string;
+        type: string;
+    };
 };
 
 // @public (undocumented)
 export type UnknownField = Record<string, unknown>;
 
 // @public (undocumented)
-export const updateCollectorValues: ActionCreatorWithPayload<
-  {
-    id: string;
-    value:
-      | string
-      | string[]
-      | PhoneNumberInputValue
-      | PhoneNumberExtensionInputValue
-      | FidoRegistrationInputValue
-      | FidoAuthenticationInputValue;
-    index?: number;
-  },
-  string
->;
+export const updateCollectorValues: ActionCreatorWithPayload<    {
+id: string;
+value: string | string[] | PhoneNumberInputValue | FidoRegistrationInputValue | FidoAuthenticationInputValue;
+index?: number;
+}, string>;
 
 // @public
-export type Updater<T = unknown> = (
-  value: CollectorValueType<T>,
-  index?: number,
-) => InternalErrorResponse | null;
+export type Updater<T = unknown> = (value: CollectorValueType<T>, index?: number) => InternalErrorResponse | null;
 
 // @public (undocumented)
 export type ValidatedField = {
-  type: 'TEXT';
-  key: string;
-  label: string;
-  required: boolean;
-  validation: {
-    regex: string;
-    errorMessage: string;
-  };
-};
-
-// @public (undocumented)
-export interface ValidatedPasswordCollector {
-  // (undocumented)
-  category: 'SingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-    validation: PasswordPolicy;
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
+    type: 'TEXT';
     key: string;
     label: string;
-    type: string;
-    verify: boolean;
-  };
-  // (undocumented)
-  type: 'ValidatedPasswordCollector';
-}
+    required: boolean;
+    validation: {
+        regex: string;
+        errorMessage: string;
+    };
+};
 
 // @public (undocumented)
 export interface ValidatedSingleValueCollectorWithValue<T extends SingleValueCollectorTypes> {
-  // (undocumented)
-  category: 'ValidatedSingleValueCollector';
-  // (undocumented)
-  error: string | null;
-  // (undocumented)
-  id: string;
-  // (undocumented)
-  input: {
-    key: string;
-    value: string | number | boolean;
-    type: string;
-    validation: (ValidationRequired | ValidationRegex)[];
-  };
-  // (undocumented)
-  name: string;
-  // (undocumented)
-  output: {
-    key: string;
-    label: string;
-    type: string;
-    value: string | number | boolean;
-  };
-  // (undocumented)
-  type: T;
+    // (undocumented)
+    category: 'ValidatedSingleValueCollector';
+    // (undocumented)
+    error: string | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    input: {
+        key: string;
+        value: string | number | boolean;
+        type: string;
+        validation: (ValidationRequired | ValidationRegex)[];
+    };
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    output: {
+        key: string;
+        label: string;
+        type: string;
+        value: string | number | boolean;
+    };
+    // (undocumented)
+    type: T;
 }
 
 // @public (undocumented)
@@ -2532,44 +1773,43 @@ export type ValidatedTextCollector = ValidatedSingleValueCollectorWithValue<'Tex
 
 // @public (undocumented)
 export interface ValidationPhoneNumber {
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  rule: boolean;
-  // (undocumented)
-  type: 'validatePhoneNumber';
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    rule: boolean;
+    // (undocumented)
+    type: 'validatePhoneNumber';
 }
 
 // @public (undocumented)
 export interface ValidationRegex {
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  rule: string;
-  // (undocumented)
-  type: 'regex';
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    rule: string;
+    // (undocumented)
+    type: 'regex';
 }
 
 // @public (undocumented)
 export interface ValidationRequired {
-  // (undocumented)
-  message: string;
-  // (undocumented)
-  rule: boolean;
-  // (undocumented)
-  type: 'required';
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    rule: boolean;
+    // (undocumented)
+    type: 'required';
 }
 
 // @public (undocumented)
-export type Validator = (value: string) =>
-  | string[]
-  | {
-      error: {
+export type Validator = (value: string) => string[] | {
+    error: {
         message: string;
         type: string;
-      };
-      type: string;
     };
+    type: string;
+};
 
 // (No @packageDocumentation comment for this package)
+
 ```
diff --git a/packages/davinci-client/src/lib/client.store.effects.test.ts b/packages/davinci-client/src/lib/client.store.effects.test.ts
index 365118aac0..299e0467cc 100644
--- a/packages/davinci-client/src/lib/client.store.effects.test.ts
+++ b/packages/davinci-client/src/lib/client.store.effects.test.ts
@@ -6,58 +6,211 @@
  */
 
 import { Micro } from 'effect';
+import * as Either from 'effect/Either';
+import * as Option from 'effect/Option';
 import { describe, expect, vi } from 'vitest';
 import { it } from '@effect/vitest';
 
 import {
   buildChallengeEndpoint,
+  classifyPollResponse,
   isChallengeStillPending,
   interpretChallengeResponse,
   getPollingModeµ,
+  validatePollingPrerequisitesµ,
 } from './client.store.effects.js';
 import type { PollDispatchResult } from './client.store.effects.js';
 import type { PollingCollector } from './collector.types.js';
+import { logger } from '@forgerock/sdk-logger';
+import { createClientStore } from './client.store.utils.js';
 
-const mockLog = {
+const mockLog: ReturnType<typeof logger> = {
+  changeLevel: vi.fn(),
   debug: vi.fn(),
   error: vi.fn(),
   warn: vi.fn(),
   info: vi.fn(),
-} as any;
+};
 
 // ---------------------------------------------------------------------------
 // buildChallengeEndpoint
 // ---------------------------------------------------------------------------
 
 describe('buildChallengeEndpoint', () => {
-  it('returns a constructed URL string for a valid self link', () => {
+  it('returns Right with constructed URL for a valid self link', () => {
     const selfHref =
       'https://auth.pingone.ca/3b2b0d54-99f9-4c28-b57e-d4e66e8e72c2/davinci/orchestrate';
     const challenge = 'abc123';
 
     const result = buildChallengeEndpoint(selfHref, challenge);
 
-    expect(result).toBe(
+    expect(Either.isRight(result)).toBe(true);
+    expect(Either.getOrThrow(result)).toBe(
       'https://auth.pingone.ca/3b2b0d54-99f9-4c28-b57e-d4e66e8e72c2/davinci/user/credentials/challenge/abc123/status',
     );
   });
 
-  it('returns InternalErrorResponse when envId is missing from URL path', () => {
+  it('returns Left with InternalErrorResponse when envId is missing from URL path', () => {
     // pathname is just '/' → split gives ['', ''] → envId is empty string → falsy
     const selfHref = 'https://auth.pingone.ca/';
     const challenge = 'abc123';
 
     const result = buildChallengeEndpoint(selfHref, challenge);
 
-    expect(typeof result).toBe('object');
-    expect((result as any).type).toBe('internal_error');
+    expect(Either.isLeft(result)).toBe(true);
+    expect(Option.getOrThrow(Either.getLeft(result))).toMatchObject({ type: 'internal_error' });
   });
 
-  it('returns InternalErrorResponse for a completely invalid URL', () => {
+  it('returns Left with InternalErrorResponse for a completely invalid URL', () => {
     const result = buildChallengeEndpoint('not-a-url', 'abc123');
 
-    expect(typeof result).toBe('object');
-    expect((result as any).type).toBe('internal_error');
+    expect(Either.isLeft(result)).toBe(true);
+    expect(Option.getOrThrow(Either.getLeft(result))).toMatchObject({ type: 'internal_error' });
+  });
+});
+
+// ---------------------------------------------------------------------------
+// validatePollingPrerequisitesµ
+// ---------------------------------------------------------------------------
+
+function makeContinueState(interactionId: string, selfHref: string) {
+  const store = createClientStore({});
+  store.dispatch({
+    type: 'node/next',
+    payload: {
+      httpStatus: 200,
+      requestId: 'test-request',
+      data: {
+        _links: { self: { href: selfHref } },
+        id: 'node-1',
+        interactionId,
+        interactionToken: 'token',
+        eventName: 'continue',
+        form: { components: { fields: [] } },
+      },
+    },
+  });
+  return store.getState();
+}
+
+describe('validatePollingPrerequisitesµ', () => {
+  it('fails with state_error when challenge is empty', async () => {
+    const state = makeContinueState(
+      'interaction-1',
+      'https://auth.pingone.ca/env1/davinci/orchestrate',
+    );
+
+    const result = await Micro.runPromiseExit(validatePollingPrerequisitesµ(state, ''));
+
+    expect(Micro.exitIsFailure(result)).toBe(true);
+    expect(result).toMatchObject({ cause: { error: { type: 'internal_error' } } });
+  });
+
+  it('fails with state_error when node is not in continue state', async () => {
+    const store = createClientStore({});
+    const state = store.getState();
+
+    const result = await Micro.runPromiseExit(validatePollingPrerequisitesµ(state, 'abc123'));
+
+    expect(Micro.exitIsFailure(result)).toBe(true);
+    expect(result).toMatchObject({ cause: { error: { type: 'internal_error' } } });
+  });
+
+  it('fails with state_error when interactionId is missing', async () => {
+    const store = createClientStore({});
+    store.dispatch({
+      type: 'node/next',
+      payload: {
+        httpStatus: 200,
+        requestId: 'test-request',
+        data: {
+          _links: { self: { href: 'https://auth.pingone.ca/env1/davinci/orchestrate' } },
+          id: 'node-1',
+          interactionToken: 'token',
+          eventName: 'continue',
+          form: { components: { fields: [] } },
+        },
+      },
+    });
+
+    const result = await Micro.runPromiseExit(
+      validatePollingPrerequisitesµ(store.getState(), 'abc123'),
+    );
+
+    expect(Micro.exitIsFailure(result)).toBe(true);
+    expect(result).toMatchObject({ cause: { error: { type: 'internal_error' } } });
+  });
+
+  it('succeeds with interactionId and constructed challengeEndpoint', async () => {
+    const state = makeContinueState(
+      'interaction-abc',
+      'https://auth.pingone.ca/3b2b0d54-99f9-4c28-b57e-d4e66e8e72c2/davinci/orchestrate',
+    );
+
+    const result = await Micro.runPromiseExit(validatePollingPrerequisitesµ(state, 'abc123'));
+
+    expect(Micro.exitIsSuccess(result)).toBe(true);
+    expect(result).toMatchObject({
+      value: {
+        interactionId: 'interaction-abc',
+        challengeEndpoint:
+          'https://auth.pingone.ca/3b2b0d54-99f9-4c28-b57e-d4e66e8e72c2/davinci/user/credentials/challenge/abc123/status',
+      },
+    });
+  });
+});
+
+// ---------------------------------------------------------------------------
+// classifyPollResponse
+// ---------------------------------------------------------------------------
+
+describe('classifyPollResponse', () => {
+  it("classifies a 400 error with serviceName 'challengeExpired' as _tag: expired", () => {
+    const response: PollDispatchResult = {
+      error: { status: 400, data: { serviceName: 'challengeExpired' } },
+    };
+    expect(classifyPollResponse(response)).toMatchObject({ _tag: 'expired' });
+  });
+
+  it('classifies other HTTP errors as _tag: error', () => {
+    const response: PollDispatchResult = {
+      error: { status: 500, data: { message: 'Server Error' } },
+    };
+    expect(classifyPollResponse(response)).toMatchObject({ _tag: 'error' });
+  });
+
+  it('classifies a SerializedError as _tag: internalError', () => {
+    const response: PollDispatchResult = {
+      error: { name: 'SerializedError', message: 'Network failure' },
+    };
+    expect(classifyPollResponse(response)).toMatchObject({ _tag: 'internalError' });
+  });
+
+  it('classifies non-object data as _tag: error', () => {
+    const response: PollDispatchResult = { data: 'just a string' };
+    expect(classifyPollResponse(response)).toMatchObject({ _tag: 'error' });
+  });
+
+  it('classifies a completed challenge as _tag: complete with status', () => {
+    const response: PollDispatchResult = {
+      data: { isChallengeComplete: true, status: 'approved' },
+    };
+    expect(classifyPollResponse(response)).toMatchObject({ _tag: 'complete', status: 'approved' });
+  });
+
+  it('classifies a completed challenge with missing status as _tag: error', () => {
+    const response: PollDispatchResult = { data: { isChallengeComplete: true } };
+    expect(classifyPollResponse(response)).toMatchObject({ _tag: 'error' });
+  });
+
+  it('classifies an in-progress challenge as _tag: pending', () => {
+    const response: PollDispatchResult = { data: { isChallengeComplete: false } };
+    expect(classifyPollResponse(response)).toMatchObject({ _tag: 'pending' });
+  });
+
+  it('classifies a response with no isChallengeComplete field as _tag: pending', () => {
+    const response: PollDispatchResult = { data: { someOtherField: 'value' } };
+    expect(classifyPollResponse(response)).toMatchObject({ _tag: 'pending' });
   });
 });
 
@@ -94,74 +247,64 @@ describe('isChallengeStillPending', () => {
 // ---------------------------------------------------------------------------
 
 describe('interpretChallengeResponse', () => {
-  it("returns 'expired' for a 400 error with serviceName 'challengeExpired'", () => {
+  it("returns Right 'expired' for a 400 error with serviceName 'challengeExpired'", () => {
     const response: PollDispatchResult = {
       error: { status: 400, data: { serviceName: 'challengeExpired' } },
     };
-
     const result = interpretChallengeResponse(response, mockLog);
-
-    expect(result).toBe('expired');
+    expect(Either.isRight(result)).toBe(true);
+    expect(Either.getOrThrow(result)).toBe('expired');
   });
 
-  it("returns 'error' for other HTTP errors (status 500)", () => {
+  it("returns Right 'error' for other HTTP errors (status 500)", () => {
     const response: PollDispatchResult = {
       error: { status: 500, data: { message: 'Server Error' } },
     };
-
     const result = interpretChallengeResponse(response, mockLog);
-
-    expect(result).toBe('error');
+    expect(Either.isRight(result)).toBe(true);
+    expect(Either.getOrThrow(result)).toBe('error');
   });
 
-  it('returns InternalErrorResponse for a SerializedError (has message, no status)', () => {
+  it('returns Left InternalErrorResponse for a SerializedError', () => {
     const response: PollDispatchResult = {
       error: { name: 'SerializedError', message: 'Network failure' },
     };
-
     const result = interpretChallengeResponse(response, mockLog);
-
-    expect(typeof result).toBe('object');
-    expect((result as any).type).toBe('internal_error');
-    expect((result as any).error.message).toBe('Network failure');
+    expect(Either.isLeft(result)).toBe(true);
+    expect(Option.getOrThrow(Either.getLeft(result))).toMatchObject({
+      type: 'internal_error',
+      error: { message: 'Network failure' },
+    });
   });
 
-  it("returns 'error' for non-object data", () => {
+  it("returns Right 'error' for non-object data", () => {
     const response: PollDispatchResult = { data: 'just a string' };
-
     const result = interpretChallengeResponse(response, mockLog);
-
-    expect(result).toBe('error');
+    expect(Either.isRight(result)).toBe(true);
+    expect(Either.getOrThrow(result)).toBe('error');
   });
 
-  it('returns the status from a completed challenge', () => {
+  it('returns Right with the status from a completed challenge', () => {
     const response: PollDispatchResult = {
       data: { isChallengeComplete: true, status: 'approved' },
     };
-
     const result = interpretChallengeResponse(response, mockLog);
-
-    expect(result).toBe('approved');
+    expect(Either.isRight(result)).toBe(true);
+    expect(Either.getOrThrow(result)).toBe('approved');
   });
 
-  it("returns 'error' when challenge is complete but status is missing", () => {
-    const response: PollDispatchResult = {
-      data: { isChallengeComplete: true },
-    };
-
+  it("returns Right 'error' when challenge is complete but status is missing", () => {
+    const response: PollDispatchResult = { data: { isChallengeComplete: true } };
     const result = interpretChallengeResponse(response, mockLog);
-
-    expect(result).toBe('error');
+    expect(Either.isRight(result)).toBe(true);
+    expect(Either.getOrThrow(result)).toBe('error');
   });
 
-  it("returns 'timedOut' for an incomplete challenge when the schedule is exhausted", () => {
-    const response: PollDispatchResult = {
-      data: { isChallengeComplete: false },
-    };
-
+  it("returns Right 'timedOut' for an incomplete challenge when the schedule is exhausted", () => {
+    const response: PollDispatchResult = { data: { isChallengeComplete: false } };
     const result = interpretChallengeResponse(response, mockLog);
-
-    expect(result).toBe('timedOut');
+    expect(Either.isRight(result)).toBe(true);
+    expect(Either.getOrThrow(result)).toBe('timedOut');
   });
 });
 
@@ -240,7 +383,10 @@ describe('getPollingModeµ', () => {
 
   it.effect('fails when collector type is not PollingCollector', () =>
     Micro.gen(function* () {
-      const badCollector = { ...basePollingCollector, type: 'TextCollector' } as any;
+      const badCollector = {
+        ...basePollingCollector,
+        type: 'TextCollector',
+      } as unknown as PollingCollector;
 
       const result = yield* Micro.exit(getPollingModeµ(badCollector));
 
diff --git a/packages/davinci-client/src/lib/client.store.effects.ts b/packages/davinci-client/src/lib/client.store.effects.ts
index 9923ea4b67..f162b5ee73 100644
--- a/packages/davinci-client/src/lib/client.store.effects.ts
+++ b/packages/davinci-client/src/lib/client.store.effects.ts
@@ -6,6 +6,7 @@
  */
 
 import { Micro } from 'effect';
+import * as Either from 'effect/Either';
 import { SerializedError } from '@reduxjs/toolkit/react';
 import { FetchBaseQueryError } from '@reduxjs/toolkit/query/react';
 
@@ -15,7 +16,7 @@ import type { ClientStore, RootState } from './client.store.utils.js';
 import type { PollingStatus, InternalErrorResponse } from './client.types.js';
 import type { PollingCollector } from './collector.types.js';
 
-import { createInternalError, isInternalError } from './client.store.utils.js';
+import { createInternalError } from './client.store.utils.js';
 import { davinciApi } from './davinci.api.js';
 import { nodeSlice } from './node.slice.js';
 
@@ -92,38 +93,31 @@ export function getPollingModeµ(
 export function buildChallengeEndpoint(
   selfHref: string,
   challenge: string,
-): string | InternalErrorResponse {
-  try {
-    const url = new URL(selfHref);
-    const envId = url.pathname.split('/')[1];
-
-    if (!url.origin || !envId) {
-      return createInternalError(
-        'Failed to construct challenge polling endpoint. Requires host and environment ID.',
-        'parse_error',
-      );
-    }
+): Either.Either<string, InternalErrorResponse> {
+  const parseError = createInternalError(
+    'Failed to construct challenge polling endpoint. Requires host and environment ID.',
+    'parse_error',
+  );
 
-    return `${url.origin}/${envId}/davinci/user/credentials/challenge/${challenge}/status`;
-  } catch {
-    return createInternalError(
-      'Failed to construct challenge polling endpoint. Requires host and environment ID.',
-      'parse_error',
-    );
-  }
+  return Either.try({ try: () => new URL(selfHref), catch: () => parseError }).pipe(
+    Either.flatMap((url) => {
+      const envId = url.pathname.split('/')[1];
+      return url.origin && envId
+        ? Either.right(
+            `${url.origin}/${envId}/davinci/user/credentials/challenge/${challenge}/status`,
+          )
+        : Either.left(parseError);
+    }),
+  );
 }
 
-/**
- * Lifts a selector result with { error, state } shape into a Micro.
- * Succeeds with state when error is null, fails with InternalErrorResponse otherwise.
- */
-function fromSelectorµ<T>(result: {
+function fromSelector<T>(result: {
   error: { message: string } | null;
   state: T;
-}): Micro.Micro<NonNullable<T>, InternalErrorResponse> {
+}): Either.Either<NonNullable<T>, InternalErrorResponse> {
   return result.error
-    ? Micro.fail(createInternalError(result.error.message, 'state_error'))
-    : Micro.succeed(result.state as NonNullable<T>);
+    ? Either.left(createInternalError(result.error.message, 'state_error'))
+    : Either.right(result.state as NonNullable<T>);
 }
 
 /**
@@ -140,7 +134,7 @@ export function validatePollingPrerequisitesµ(
     );
   }
 
-  return fromSelectorµ(nodeSlice.selectors.selectContinueServer(rootState)).pipe(
+  return Micro.fromEither(fromSelector(nodeSlice.selectors.selectContinueServer(rootState))).pipe(
     Micro.filterOrFail(
       (server) => !!server.interactionId,
       () =>
@@ -150,81 +144,85 @@ export function validatePollingPrerequisitesµ(
         ),
     ),
     Micro.flatMap((server) =>
-      fromSelectorµ(nodeSlice.selectors.selectSelfLink(rootState)).pipe(
+      Micro.fromEither(fromSelector(nodeSlice.selectors.selectSelfLink(rootState))).pipe(
         Micro.map((selfLink) => ({ server, selfLink })),
       ),
     ),
-    Micro.flatMap(({ server, selfLink }) => {
-      const endpoint = buildChallengeEndpoint(selfLink, challenge);
-      return typeof endpoint === 'string'
-        ? Micro.succeed({
-            interactionId: server.interactionId!,
-            challengeEndpoint: endpoint,
-          })
-        : Micro.fail(endpoint);
-    }),
+    Micro.flatMap(({ server, selfLink }) =>
+      Either.match(buildChallengeEndpoint(selfLink, challenge), {
+        onLeft: Micro.fail,
+        onRight: (challengeEndpoint) =>
+          Micro.succeed({ interactionId: server.interactionId as string, challengeEndpoint }),
+      }),
+    ),
   );
 }
 
-/**
- * Pure predicate: determines if challenge polling should continue.
- * Returns true when the challenge has not yet completed and no error occurred.
- */
-export function isChallengeStillPending(response: PollDispatchResult): boolean {
-  if (response.error) return false;
-
-  const data = isRecord(response.data) ? response.data : undefined;
-  if (data?.['isChallengeComplete']) return false;
+type PollClassification =
+  | { _tag: 'expired' }
+  | { _tag: 'error' }
+  | { _tag: 'internalError'; error: InternalErrorResponse }
+  | { _tag: 'complete'; status: PollingStatus }
+  | { _tag: 'pending' };
 
-  return true;
-}
-
-export function interpretChallengeResponse(
-  response: PollDispatchResult,
-  log: ReturnType<typeof loggerFn>,
-): PollingStatus | InternalErrorResponse {
+export function classifyPollResponse(response: PollDispatchResult): PollClassification {
   const { data, error } = response;
 
   if (error) {
-    // FetchBaseQueryError — has status field
     if ('status' in error) {
       const errorDetails = isRecord(error.data) ? error.data : undefined;
-      const serviceName = errorDetails?.['serviceName'];
-
-      // Expired challenge is an expected polling outcome, not a failure
-      if (error.status === 400 && serviceName === 'challengeExpired') {
-        log.debug('Challenge expired for polling');
-        return 'expired';
+      if (error.status === 400 && errorDetails?.['serviceName'] === 'challengeExpired') {
+        return { _tag: 'expired' };
       }
-
-      // Other HTTP errors are also expected outcomes (e.g. bad challenge returning 400 with code 4019)
-      log.debug('Unknown error occurred during polling');
-      return 'error';
+      return { _tag: 'error' };
     }
 
-    // SerializedError — has message field
     const message =
       'message' in error && error.message
         ? error.message
         : 'An unknown error occurred while challenge polling';
-
-    return createInternalError(message, 'unknown_error');
+    return { _tag: 'internalError', error: createInternalError(message, 'unknown_error') };
   }
 
-  if (!isRecord(data)) {
-    log.debug('Unable to parse polling response');
-    return 'error';
-  }
+  if (!isRecord(data)) return { _tag: 'error' };
 
-  // Challenge completed — extract status
   if (data['isChallengeComplete'] === true) {
-    const pollStatus = data['status'];
-    return pollStatus ? (pollStatus as PollingStatus) : 'error';
+    const status = data['status'];
+    return status ? { _tag: 'complete', status: status as PollingStatus } : { _tag: 'error' };
   }
 
-  // If we reach here, Micro.repeat exhausted its schedule without the challenge completing
-  log.debug('Challenge polling timed out');
-  return 'timedOut';
+  return { _tag: 'pending' };
+}
+
+export function isChallengeStillPending(response: PollDispatchResult): boolean {
+  return classifyPollResponse(response)._tag === 'pending';
+}
+
+export function interpretChallengeResponse(
+  response: PollDispatchResult,
+  log: ReturnType<typeof loggerFn>,
+): Either.Either<PollingStatus, InternalErrorResponse> {
+  const classification = classifyPollResponse(response);
+
+  switch (classification._tag) {
+    case 'expired':
+      log.debug('Challenge expired for polling');
+      return Either.right('expired');
+    case 'error':
+      log.debug('Unknown error occurred during polling');
+      return Either.right('error');
+    case 'internalError':
+      return Either.left(classification.error);
+    case 'complete':
+      return Either.right(classification.status);
+    case 'pending':
+      log.debug('Challenge polling timed out');
+      return Either.right('timedOut');
+    default: {
+      const exhaustive: never = classification;
+      throw new Error(`Unhandled poll classification: ${JSON.stringify(exhaustive)}`);
+    }
+  }
 }
 
 /**
@@ -262,10 +260,7 @@ function challengePollingµ({
       times: maxRetries - 1,
       schedule: Micro.scheduleSpaced(pollInterval),
     }),
-    Micro.map((response) => interpretChallengeResponse(response, log)),
-    Micro.flatMap((result) =>
-      isInternalError(result) ? Micro.fail(result) : Micro.succeed(result),
-    ),
+    Micro.flatMap((response) => Micro.fromEither(interpretChallengeResponse(response, log))),
   );
 }
 
diff --git a/packages/davinci-client/src/lib/davinci.utils.test.ts b/packages/davinci-client/src/lib/davinci.utils.test.ts
index 094d4d945c..d0257b3232 100644
--- a/packages/davinci-client/src/lib/davinci.utils.test.ts
+++ b/packages/davinci-client/src/lib/davinci.utils.test.ts
@@ -8,7 +8,12 @@ import { describe, it, expect, vi } from 'vitest';
 
 import { logger } from '@forgerock/sdk-logger';
 
-import { handleResponse, transformSubmitRequest, transformActionRequest } from './davinci.utils.js';
+import {
+  handleResponse,
+  classifyResponse,
+  transformSubmitRequest,
+  transformActionRequest,
+} from './davinci.utils.js';
 
 import type { ContinueNode } from './node.types.d.ts';
 import { next0 } from './mock-data/davinci.next.mock.js';
@@ -252,6 +257,173 @@ describe('transformActionRequest', () => {
   });
 });
 
+// ---------------------------------------------------------------------------
+// classifyResponse
+// ---------------------------------------------------------------------------
+
+describe('classifyResponse', () => {
+  it('classifies a next response as _tag: next', () => {
+    const cacheEntry = {
+      data: next0,
+      error: undefined,
+      requestId: '123',
+      status: 'fulfilled',
+      isError: false,
+      isSuccess: true,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 200);
+
+    expect(result).toMatchObject({ _tag: 'next' });
+  });
+
+  it('classifies a success response as _tag: success', () => {
+    const cacheEntry = {
+      data: success0,
+      error: undefined,
+      requestId: '123',
+      status: 'fulfilled',
+      isError: false,
+      isSuccess: true,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 200);
+
+    expect(result).toMatchObject({ _tag: 'success' });
+  });
+
+  it('classifies a recoverable 4XX error as _tag: error with logMessage', () => {
+    const cacheEntry = {
+      data: undefined,
+      error: { data: error0a, status: 400 },
+      requestId: '123',
+      status: 'rejected',
+      isError: true,
+      isSuccess: false,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 400);
+
+    expect(result).toMatchObject({
+      _tag: 'error',
+      logMessage: 'Response with this error type should be recoverable',
+    });
+  });
+
+  it('classifies a 5XX error as _tag: failure with logMessage', () => {
+    const cacheEntry = {
+      data: undefined,
+      error: { data: {}, status: 500 },
+      requestId: '123',
+      status: 'rejected',
+      isError: true,
+      isSuccess: false,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 500);
+
+    expect(result).toMatchObject({
+      _tag: 'failure',
+      logMessage: 'Response of 5XX indicates unrecoverable failure',
+    });
+  });
+
+  it('classifies a timeout error (code 1999) as _tag: failure with logMessage', () => {
+    const cacheEntry = {
+      data: undefined,
+      error: { data: error3, status: 400 },
+      requestId: '123',
+      status: 'rejected',
+      isError: true,
+      isSuccess: false,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 400);
+
+    expect(result).toMatchObject({ _tag: 'failure', logMessage: 'Error is a client-side timeout' });
+  });
+
+  it('classifies a pingOneAuthenticationConnector failure as _tag: failure with logMessage', () => {
+    const cacheEntry = {
+      data: undefined,
+      error: {
+        data: {
+          connectorId: 'pingOneAuthenticationConnector',
+          capabilityName: 'returnSuccessResponseRedirect',
+        },
+        status: 400,
+      },
+      requestId: '123',
+      status: 'rejected',
+      isError: true,
+      isSuccess: false,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 400);
+
+    expect(result).toMatchObject({
+      _tag: 'failure',
+      logMessage: 'Error is a PingOne Authentication Connector unrecoverable failure',
+    });
+  });
+
+  it('classifies a FETCH_ERROR as _tag: failure with logMessage', () => {
+    const cacheEntry = {
+      data: undefined,
+      error: { data: {}, status: 'FETCH_ERROR' },
+      requestId: '123',
+      status: 'rejected',
+      isError: true,
+      isSuccess: false,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 0);
+
+    expect(result).toMatchObject({
+      _tag: 'failure',
+      logMessage:
+        'Response with FETCH_ERROR indicates configuration failure. Please ensure a correct Client ID for your OAuth application.',
+    });
+  });
+
+  it('classifies a 2XX response with error property as _tag: failure with logMessage', () => {
+    const cacheEntry = {
+      data: { error: { code: 'unknown', status: 400 } },
+      error: undefined,
+      requestId: '123',
+      status: 'fulfilled',
+      isError: false,
+      isSuccess: true,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 200);
+
+    expect(result).toMatchObject({
+      _tag: 'failure',
+      logMessage: 'Response with `isSuccess` but `error` property indicates unrecoverable failure',
+    });
+  });
+
+  it('classifies a 2XX response with status:failure as _tag: failure with logMessage', () => {
+    const cacheEntry = {
+      data: { status: 'failure' },
+      error: undefined,
+      requestId: '123',
+      status: 'fulfilled',
+      isError: false,
+      isSuccess: true,
+    } as DaVinciCacheEntry;
+
+    const result = classifyResponse(cacheEntry, 200);
+
+    expect(result).toMatchObject({
+      _tag: 'failure',
+      logMessage:
+        'Response with `isSuccess` and `status` of "failure" indicates unrecoverable failure',
+    });
+  });
+});
+
 describe('handleResponse', () => {
   it('should handle a next response', () => {
     const cacheEntry = {
@@ -425,4 +597,29 @@ describe('handleResponse', () => {
     const [action] = dispatch.mock.calls[0];
     expect(action.type).toBe('node/failure');
   });
+
+  it('logs the classification-specific message via logger', () => {
+    const cacheEntry = {
+      data: undefined,
+      error: { data: {}, status: 500 },
+      requestId: '123',
+      status: 'rejected',
+      isError: true,
+      isSuccess: false,
+    } as DaVinciCacheEntry;
+    const dispatch = vi.fn();
+    const mockLogger: ReturnType<typeof logger> = {
+      changeLevel: vi.fn(),
+      error: vi.fn(),
+      debug: vi.fn(),
+      warn: vi.fn(),
+      info: vi.fn(),
+    };
+
+    handleResponse(cacheEntry, dispatch, 500, mockLogger);
+
+    expect(mockLogger.error).toHaveBeenCalledWith(
+      'Response of 5XX indicates unrecoverable failure',
+    );
+  });
 });
diff --git a/packages/davinci-client/src/lib/davinci.utils.ts b/packages/davinci-client/src/lib/davinci.utils.ts
index f3271d1017..363babff15 100644
--- a/packages/davinci-client/src/lib/davinci.utils.ts
+++ b/packages/davinci-client/src/lib/davinci.utils.ts
@@ -8,6 +8,7 @@
  * Import the used types
  */
 import type { Dispatch } from '@reduxjs/toolkit';
+import * as Either from 'effect/Either';
 
 import { logger as loggerFn } from '@forgerock/sdk-logger';
 
@@ -114,161 +115,202 @@ export function transformActionRequest(
   };
 }
 
-export function handleResponse(
-  cacheEntry: DaVinciCacheEntry,
-  dispatch: Dispatch,
-  status: number,
-  logger: ReturnType<typeof loggerFn>,
-) {
-  /**
-   * 5XX errors are treated as unrecoverable failures
-   */
-  if (cacheEntry.isError && cacheEntry.error.status >= 500) {
-    logger.error('Response of 5XX indicates unrecoverable failure');
-    const data = cacheEntry.error.data as unknown;
-    const requestId = cacheEntry.requestId;
-    dispatch(nodeSlice.actions.failure({ data, requestId, httpStatus: cacheEntry.error.status }));
+type ResponseClassification =
+  | { _tag: 'failure'; data: unknown; requestId: string; httpStatus: number; logMessage: string }
+  | {
+      _tag: 'error';
+      data: DavinciErrorResponse;
+      requestId: string;
+      httpStatus: number;
+      logMessage: string;
+    }
+  | { _tag: 'success'; data: DaVinciSuccessResponse; requestId: string; httpStatus: number }
+  | { _tag: 'poll'; requestId: string }
+  | { _tag: 'next'; data: DaVinciNextResponse; requestId: string; httpStatus: number };
 
-    return; // Filter out 5XX's
+function classifyError(
+  error: NonNullable<DaVinciCacheEntry['error']>,
+  requestId: string,
+): ResponseClassification {
+  if (error.status >= 500) {
+    return {
+      _tag: 'failure',
+      data: error.data,
+      requestId,
+      httpStatus: error.status,
+      logMessage: 'Response of 5XX indicates unrecoverable failure',
+    };
   }
 
-  /**
-   * Check for 4XX errors that are unrecoverable
-   */
-  if (cacheEntry.isError && cacheEntry.error.status >= 400 && cacheEntry.error.status < 500) {
-    const data = cacheEntry.error.data as DavinciErrorResponse;
-    const requestId = cacheEntry.requestId;
-
-    // Filter out client-side "timeout" related unrecoverable failures
-    if (data.code === 1999 || data.code === 'requestTimedOut') {
-      logger.error('Error is a client-side timeout');
-      dispatch(nodeSlice.actions.failure({ data, requestId, httpStatus: cacheEntry.error.status }));
+  if (error.status === 'FETCH_ERROR') {
+    return {
+      _tag: 'failure',
+      data: {
+        code: error.status,
+        message: 'Fetch Error: Please ensure a correct Client ID for your OAuth application.',
+      },
+      requestId,
+      httpStatus: 0,
+      logMessage:
+        'Response with FETCH_ERROR indicates configuration failure. Please ensure a correct Client ID for your OAuth application.',
+    };
+  }
 
-      return; // Filter out timeouts
-    }
+  const data = error.data as DavinciErrorResponse;
 
-    // Filter our "PingOne Authentication Connector" unrecoverable failures
-    if (
-      data.connectorId === 'pingOneAuthenticationConnector' &&
-      (data.capabilityName === 'returnSuccessResponseRedirect' ||
-        data.capabilityName === 'setSession')
-    ) {
-      logger.error('Error is a PingOne Authentication Connector unrecoverable failure');
-      dispatch(nodeSlice.actions.failure({ data, requestId, httpStatus: cacheEntry.error.status }));
+  if (data.code === 1999 || data.code === 'requestTimedOut') {
+    return {
+      _tag: 'failure',
+      data,
+      requestId,
+      httpStatus: error.status,
+      logMessage: 'Error is a client-side timeout',
+    };
+  }
 
-      return;
-    }
+  if (
+    data.connectorId === 'pingOneAuthenticationConnector' &&
+    (data.capabilityName === 'returnSuccessResponseRedirect' ||
+      data.capabilityName === 'setSession')
+  ) {
+    return {
+      _tag: 'failure',
+      data,
+      requestId,
+      httpStatus: error.status,
+      logMessage: 'Error is a PingOne Authentication Connector unrecoverable failure',
+    };
+  }
 
-    logger.debug('Response with this error type should be recoverable');
-    // If we're still here, we have a 4XX failure that should be recoverable
-    dispatch(nodeSlice.actions.error({ data, requestId, httpStatus: cacheEntry.error.status }));
+  return {
+    _tag: 'error',
+    data,
+    requestId,
+    httpStatus: error.status,
+    logMessage: 'Response with this error type should be recoverable',
+  };
+}
 
-    return;
+function classifySuccess(
+  data: NonNullable<DaVinciCacheEntry['data']>,
+  requestId: string,
+  httpStatus: number,
+): ResponseClassification {
+  if ('error' in data) {
+    return {
+      _tag: 'failure',
+      data: (data as DaVinciFailureResponse).error,
+      requestId,
+      httpStatus,
+      logMessage: 'Response with `isSuccess` but `error` property indicates unrecoverable failure',
+    };
   }
 
-  /**
-   * Check for 3XX errors that result in CORS errors, reported as FETCH_ERROR
-   */
-  if (cacheEntry.isError && cacheEntry.error.status === 'FETCH_ERROR') {
-    logger.error(
-      'Response with FETCH_ERROR indicates configuration failure. Please ensure a correct Client ID for your OAuth application.',
-    );
-    const data = {
-      code: cacheEntry.error.status,
-      message: 'Fetch Error: Please ensure a correct Client ID for your OAuth application.',
+  if ('status' in data && (data as { status: string }).status.toLowerCase() === 'failure') {
+    return {
+      _tag: 'failure',
+      data: (data as DaVinciFailureResponse).error,
+      requestId,
+      httpStatus,
+      logMessage:
+        'Response with `isSuccess` and `status` of "failure" indicates unrecoverable failure',
     };
-    const requestId = cacheEntry.requestId;
-    dispatch(nodeSlice.actions.failure({ data, requestId, httpStatus: cacheEntry.error.status }));
+  }
 
-    return;
+  if ('session' in data || 'authorizeResponse' in data) {
+    return { _tag: 'success', data: data as DaVinciSuccessResponse, requestId, httpStatus };
   }
 
-  /**
-   * If the response's HTTP status is a success (2XX), but the DaVinci API has returned an error,
-   * we need to handle this as a failure or return as unknown.
-   */
-  if (cacheEntry.isSuccess && 'error' in cacheEntry.data) {
-    logger.error('Response with `isSuccess` but `error` property indicates unrecoverable failure');
-    const data = cacheEntry.data as DaVinciFailureResponse;
-    const requestId = cacheEntry.requestId;
-    dispatch(
-      nodeSlice.actions.failure({
-        data: data.error,
-        requestId,
-        httpStatus: status,
-      }),
-    );
+  if (
+    'eventName' in data &&
+    ['rewindStateToLastRenderedUI', 'rewindStateToSpecificRenderedUI'].includes(
+      (data as { eventName: string }).eventName,
+    )
+  ) {
+    return { _tag: 'poll', requestId };
+  }
 
-    return; // Filter out 2XX errors
+  if ('_links' in data && 'next' in (data as { _links: object })._links) {
+    return { _tag: 'next', data: data as DaVinciNextResponse, requestId, httpStatus };
   }
 
-  /**
-   * If the response's HTTP status is a success (2XX), but the DaVinci API has returned an error,
-   * we need to handle this as a failure or return as unknown.
-   */
-  if (cacheEntry.isSuccess && 'status' in cacheEntry.data) {
-    const status = cacheEntry.data.status.toLowerCase();
+  return {
+    _tag: 'failure',
+    data,
+    requestId,
+    httpStatus,
+    logMessage: 'Response type is unknown and therefore an unrecoverable failure',
+  };
+}
 
-    if (status === 'failure') {
-      logger.error(
-        'Response with `isSuccess` and `status` of "failure" indicates unrecoverable failure',
-      );
-      const data = cacheEntry.data as DaVinciFailureResponse;
-      const requestId = cacheEntry.requestId;
+export function classifyResponse(
+  cacheEntry: DaVinciCacheEntry,
+  httpStatus: number,
+): ResponseClassification {
+  // requestId is typed as string | undefined by RTK; empty string produces a no-op cache key rather than crashing
+  const requestId = cacheEntry.requestId ?? '';
+  return Either.match(
+    cacheEntry.isError ? Either.left(cacheEntry.error) : Either.right(cacheEntry.data),
+    {
+      onLeft: (error) => classifyError(error, requestId),
+      onRight: (data) => classifySuccess(data, requestId, httpStatus),
+    },
+  );
+}
+
+export function handleResponse(
+  cacheEntry: DaVinciCacheEntry,
+  dispatch: Dispatch,
+  status: number,
+  logger: ReturnType<typeof loggerFn>,
+) {
+  const classification = classifyResponse(cacheEntry, status);
+
+  switch (classification._tag) {
+    case 'failure':
+      logger.error(classification.logMessage);
       dispatch(
         nodeSlice.actions.failure({
-          data: data.error,
-          requestId,
-          httpStatus: status,
+          data: classification.data,
+          requestId: classification.requestId,
+          httpStatus: classification.httpStatus,
         }),
       );
-
-      return; // Filter out 2XX errors with 'failure' status
-    } else {
-      // Do nothing
-    }
-  }
-
-  /**
-   * If we've made it here, we have a successful response and do not have an error property.
-   * Parse for state of the flow and dispatch appropriate action.
-   */
-  if (cacheEntry.isSuccess) {
-    const requestId = cacheEntry.requestId;
-
-    const hasNextUrl = () => {
-      const data = cacheEntry.data;
-
-      if ('_links' in data) {
-        if ('next' in data._links) {
-          if ('href' in data._links.next) {
-            return true;
-          }
-        }
-      }
-      return false;
-    };
-
-    const isContinuePollingEvent = () => {
-      const data = cacheEntry.data;
-      return (
-        'eventName' in data &&
-        ['rewindStateToLastRenderedUI', 'rewindStateToSpecificRenderedUI'].includes(data.eventName)
+      break;
+    case 'error':
+      logger.debug(classification.logMessage);
+      dispatch(
+        nodeSlice.actions.error({
+          data: classification.data,
+          requestId: classification.requestId,
+          httpStatus: classification.httpStatus,
+        }),
       );
-    };
-
-    if ('session' in cacheEntry.data || 'authorizeResponse' in cacheEntry.data) {
-      const data = cacheEntry.data as DaVinciSuccessResponse;
-      dispatch(nodeSlice.actions.success({ data, requestId, httpStatus: status }));
-    } else if (isContinuePollingEvent()) {
-      dispatch(nodeSlice.actions.poll({ requestId }));
-    } else if (hasNextUrl()) {
-      const data = cacheEntry.data as DaVinciNextResponse;
-      dispatch(nodeSlice.actions.next({ data, requestId, httpStatus: status }));
-    } else {
-      // If we got here, the response type is unknown and therefore an unrecoverable failure
-      const data = cacheEntry.data as DaVinciFailureResponse;
-      dispatch(nodeSlice.actions.failure({ data, requestId, httpStatus: status }));
+      break;
+    case 'success':
+      dispatch(
+        nodeSlice.actions.success({
+          data: classification.data,
+          requestId: classification.requestId,
+          httpStatus: classification.httpStatus,
+        }),
+      );
+      break;
+    case 'poll':
+      dispatch(nodeSlice.actions.poll({ requestId: classification.requestId }));
+      break;
+    case 'next':
+      dispatch(
+        nodeSlice.actions.next({
+          data: classification.data,
+          requestId: classification.requestId,
+          httpStatus: classification.httpStatus,
+        }),
+      );
+      break;
+    default: {
+      const exhaustive: never = classification;
+      throw new Error(`Unhandled response classification: ${JSON.stringify(exhaustive)}`);
     }
   }
 }
diff --git a/packages/davinci-client/src/lib/updater-narrowing.types.test-d.ts b/packages/davinci-client/src/lib/updater-narrowing.types.test-d.ts
index ca7d78b180..587f3676f4 100644
--- a/packages/davinci-client/src/lib/updater-narrowing.types.test-d.ts
+++ b/packages/davinci-client/src/lib/updater-narrowing.types.test-d.ts
@@ -45,7 +45,7 @@ type MockUpdate = <
 ) => Updater<T>;
 
 const mockUpdate: MockUpdate = (collector) => {
-  return ((value: unknown) => null) as any;
+  return ((value: unknown) => null) as Updater<typeof collector>;
 };
 
 describe('Updater Type Narrowing with Real Usage Pattern', () => {