diff --git a/.changeset/nice-sails-trade.md b/.changeset/nice-sails-trade.md
new file mode 100644
index 00000000000..e1bc0538d12
--- /dev/null
+++ b/.changeset/nice-sails-trade.md
@@ -0,0 +1,28 @@
+---
+'@forgerock/davinci-client': minor
+'@forgerock/journey-client': minor
+'@forgerock/oidc-client': minor
+'@forgerock/sdk-store': minor
+'@forgerock/sdk-oidc': patch
+---
+
+Allow multiple SDK clients to share a single Redux store.
+
+`davinci()`, `journey()`, and `oidc()` now accept an optional `store` option. When two clients share a store they share the OpenID Connect discovery cache, so `.well-known/openid-configuration` is fetched once instead of once per client. `davinci()` and `journey()` expose the store they create as `client.store`; applications that want to own the store themselves can build one with `createSdkStore()` from the new `@forgerock/sdk-store` package.
+
+Omitting `store` is unchanged behaviour: the client creates its own store, exactly as before.
+
+**Request middleware and logging are scoped per client.** Each client's `requestMiddleware` and `logger` are registered against that client alone and are resolved only by its own requests. Middleware passed to `davinci()` or `journey()` is never applied to OIDC requests (`AUTHORIZE`, `PAR`, `TOKEN_EXCHANGE`, `REVOKE`, `USER_INFO`, `END_SESSION`), and middleware passed to `oidc()` is never applied to DaVinci or Journey requests. Both options are honoured on a shared store.
+
+**`oidc()` takes `store` as part of its options object**, alongside `config`, `requestMiddleware`, `logger`, and `storage`, consistent with every other factory in the SDK.
+
+**One OIDC client per store.** `oidc()` mounts at a fixed key, so initialising a second OIDC client on the same store with a different `clientId` returns an `argument_error` rather than silently overwriting the first client's token state. Re-initialising with the same `clientId` is allowed and idempotent. Use a separate store per `clientId`.
+
+Also in this release:
+
+- New `@forgerock/sdk-store` package (`scope:sdk-effects`) holding the single canonical `wellknownApi` instance, the shared store contract (`SdkStore`, `SdkStoreHandle`, `createSdkStore`, `injectClient`), and OpenID Connect discovery helpers (`initWellknownQuery`, `isValidWellknownResponse`). Previously each client package defined its own `wellknownApi`, which meant a separate discovery cache per client.
+- `oidc()` validates its arguments before attaching to a store, so a rejected call no longer leaves a caller-provided store modified.
+- Passing a value that is not an SDK store to `store` returns an `argument_error` instead of throwing.
+- Well-known selectors are now memoized per URL. `createWellknownSelector` previously rebuilt its selector on every call, so its cache never took effect.
+- `@forgerock/sdk-oidc`: `initWellknownQuery` and `isValidWellknownResponse` move to `@forgerock/sdk-store`. Update imports if you were using them directly.
+- `enforce-module-boundaries` lint rule promoted from `warn` to `error` across the repo. All packages pass.
diff --git a/e2e/davinci-app/main.ts b/e2e/davinci-app/main.ts
index 088a7a5807a..f406feb2dde 100644
--- a/e2e/davinci-app/main.ts
+++ b/e2e/davinci-app/main.ts
@@ -13,7 +13,6 @@ import type {
   Collectors,
   CustomLogger,
   DaVinciConfig,
-  DavinciClient,
   GetClient,
   InternalErrorResponse,
   NodeStates,
@@ -88,7 +87,11 @@ const requestMiddleware: RequestMiddleware<'DAVINCI_NEXT' | 'DAVINCI_START'>[] =
 const urlParams = new URLSearchParams(window.location.search);
 
 (async () => {
-  const davinciClient: DavinciClient = await davinci({ config, logger, requestMiddleware });
+  const davinciResult = await davinci({ config, logger, requestMiddleware });
+  if ('error' in davinciResult) {
+    throw new Error(`Failed to initialize davinci client: ${davinciResult.error}`);
+  }
+  const davinciClient = davinciResult;
   const oidcResult = await oidc({ config: config as OidcConfig });
   if ('error' in oidcResult) {
     throw new Error(`Failed to initialize oidc client: ${oidcResult.error}`);
diff --git a/e2e/davinci-app/shared-store.html b/e2e/davinci-app/shared-store.html
new file mode 100644
index 00000000000..e0551b54f43
--- /dev/null
+++ b/e2e/davinci-app/shared-store.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Shared Store Test</title>
+  </head>
+  <body>
+    <div id="status">initialising…</div>
+    <script type="module" src="./shared-store.ts"></script>
+  </body>
+</html>
diff --git a/e2e/davinci-app/shared-store.ts b/e2e/davinci-app/shared-store.ts
new file mode 100644
index 00000000000..555ecb1914d
--- /dev/null
+++ b/e2e/davinci-app/shared-store.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+/**
+ * Shared-store smoke test entry point.
+ *
+ * This page is navigated to by the Playwright e2e suite
+ * `shared-store.test.ts` only. It does not connect to any real PingOne
+ * endpoint — the test intercepts every `.well-known` request via
+ * `page.route()` and returns a minimal synthetic response.
+ *
+ * The page reports results by writing to `#status` so the test can
+ * assert via `page.textContent` without any app-specific UI.
+ */
+import { davinci } from '@forgerock/davinci-client';
+import type { DaVinciConfig } from '@forgerock/davinci-client/types';
+import { oidc } from '@forgerock/oidc-client';
+import type { OidcConfig } from '@forgerock/oidc-client/types';
+
+const WELLKNOWN_URL = 'https://sdk-test.example.com/as/.well-known/openid-configuration';
+
+const davinciConfig: DaVinciConfig = {
+  clientId: 'test-davinci-client',
+  redirectUri: window.location.origin,
+  scope: 'openid profile',
+  serverConfig: { wellknown: WELLKNOWN_URL },
+};
+
+const oidcConfig: OidcConfig = {
+  clientId: 'test-oidc-client',
+  redirectUri: window.location.origin,
+  scope: 'openid profile',
+  responseType: 'code',
+  serverConfig: { wellknown: WELLKNOWN_URL },
+};
+
+const statusEl = document.getElementById('status')!;
+
+async function run() {
+  // ── Mode 2: davinci creates the store, oidc attaches ─────────────────────
+  const dvClient = await davinci({ config: davinciConfig });
+  if ('error' in dvClient) {
+    statusEl.textContent = `davinci init error: ${dvClient.error}`;
+    return;
+  }
+
+  const ocClient = await oidc({ config: oidcConfig, store: dvClient.store });
+  if ('error' in ocClient) {
+    statusEl.textContent = `oidc init error: ${ocClient.error}`;
+    return;
+  }
+
+  statusEl.textContent = 'ready';
+}
+
+run().catch((err) => {
+  statusEl.textContent = `unexpected error: ${String(err)}`;
+});
diff --git a/e2e/davinci-app/vite.config.ts b/e2e/davinci-app/vite.config.ts
index 8625a27297c..b885b3911c8 100644
--- a/e2e/davinci-app/vite.config.ts
+++ b/e2e/davinci-app/vite.config.ts
@@ -17,6 +17,7 @@ export default defineConfig({
     rollupOptions: {
       input: {
         main: path.resolve(__dirname, 'index.html'),
+        'shared-store': path.resolve(__dirname, 'shared-store.html'),
       },
       output: {
         entryFileNames: 'main.js',
diff --git a/e2e/davinci-suites/src/shared-store.test.ts b/e2e/davinci-suites/src/shared-store.test.ts
new file mode 100644
index 00000000000..8ec14164459
--- /dev/null
+++ b/e2e/davinci-suites/src/shared-store.test.ts
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { expect, test } from '@playwright/test';
+
+/**
+ * Verifies that two SDK clients sharing a store fetch the OpenID Connect
+ * discovery document exactly once, regardless of which client initialises
+ * first and regardless of the ownership model.
+ *
+ * The page under test (`/shared-store`) exercises both Mode 2 (davinci owns
+ * the store) and Mode 3 (consumer-created store). Requests to the well-known
+ * URL are intercepted and served with a synthetic response so the test does
+ * not require a live PingOne endpoint.
+ */
+
+const WELLKNOWN_URL = 'https://sdk-test.example.com/as/.well-known/openid-configuration';
+
+const WELLKNOWN_RESPONSE = {
+  issuer: 'https://sdk-test.example.com/as',
+  authorization_endpoint: 'https://sdk-test.example.com/as/authorize',
+  token_endpoint: 'https://sdk-test.example.com/as/token',
+  userinfo_endpoint: 'https://sdk-test.example.com/as/userinfo',
+  jwks_uri: 'https://sdk-test.example.com/as/jwks',
+  revocation_endpoint: 'https://sdk-test.example.com/as/revoke',
+  introspection_endpoint: 'https://sdk-test.example.com/as/introspect',
+  pushed_authorization_request_endpoint: 'https://sdk-test.example.com/as/par',
+};
+
+test('shared store — one .well-known fetch across two clients (mode 2: client-owned)', async ({
+  page,
+}) => {
+  let discoveryFetchCount = 0;
+
+  // Intercept and count every discovery request; fulfil with a synthetic response
+  // so no live credential or network is needed.
+  await page.route(`**/.well-known/**`, async (route) => {
+    discoveryFetchCount++;
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify(WELLKNOWN_RESPONSE),
+    });
+  });
+
+  await page.goto('/shared-store.html', { waitUntil: 'networkidle' });
+
+  // The page reports its own status so we know initialisation completed.
+  await expect(page.locator('#status')).toHaveText('ready', { timeout: 15_000 });
+
+  // Mode 2 (davinci owns the store, oidc attaches): davinci fetches once,
+  // oidc reads from cache — exactly 1 network request for 2 clients.
+  expect(discoveryFetchCount).toBe(1);
+});
+
+test("shared store — oidc attaches to davinci's store, reads discovery from cache", async ({
+  page,
+}) => {
+  const fetchedUrls: string[] = [];
+
+  await page.route(`**/.well-known/**`, async (route) => {
+    fetchedUrls.push(route.request().url());
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify(WELLKNOWN_RESPONSE),
+    });
+  });
+
+  await page.goto('/shared-store.html', { waitUntil: 'networkidle' });
+  await expect(page.locator('#status')).toHaveText('ready', { timeout: 15_000 });
+
+  // Both modes use the same WELLKNOWN_URL, so each URL appears exactly once
+  // across the two calls despite four total client initialisations.
+  const unique = [...new Set(fetchedUrls)];
+  expect(unique).toHaveLength(1);
+  expect(unique[0]).toContain('.well-known');
+
+  // Mode 2: 2 clients (davinci + oidc) on 1 store → exactly 1 fetch.
+  expect(fetchedUrls.length).toBe(1);
+});
diff --git a/e2e/journey-app/main.ts b/e2e/journey-app/main.ts
index 18adaa66009..0fd711d8b32 100644
--- a/e2e/journey-app/main.ts
+++ b/e2e/journey-app/main.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025-2026 Ping Identity Corporation. All rights reserved.
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
  *
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
@@ -8,7 +8,7 @@ import './style.css';
 
 import { journey } from '@forgerock/journey-client';
 
-import type { JourneyClient, RequestMiddleware } from '@forgerock/journey-client/types';
+import type { RequestMiddleware } from '@forgerock/journey-client/types';
 
 import { renderCallbacks } from './callback-map.js';
 import { renderDeleteDevicesSection } from './components/delete-device.js';
@@ -62,15 +62,14 @@ if (searchParams.get('middleware') === 'true') {
   const formEl = document.getElementById('form') as HTMLFormElement;
   const journeyEl = document.getElementById('journey') as HTMLDivElement;
 
-  let journeyClient: JourneyClient;
-  try {
-    journeyClient = await journey({ config: config, requestMiddleware });
-  } catch (error) {
-    const message = error instanceof Error ? error.message : 'Unknown error';
+  const journeyResult = await journey({ config: config, requestMiddleware });
+  if ('error' in journeyResult) {
+    const message = journeyResult.error;
     console.error('Failed to initialize journey client:', message);
     errorEl.textContent = message;
     return;
   }
+  const journeyClient = journeyResult;
   let step = await journeyClient.start({ journey: journeyName });
 
   function renderError() {
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 1176254153d..0047858d6ce 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -110,7 +110,7 @@ export default [
     rules: {
       'import/extensions': [2, 'ignorePackages'],
       '@nx/enforce-module-boundaries': [
-        'warn',
+        'error',
         {
           enforceBuildableLibDependency: true,
           allow: [],
diff --git a/packages/davinci-client/README.md b/packages/davinci-client/README.md
index 5534564ffd9..a12ab1e61ee 100644
--- a/packages/davinci-client/README.md
+++ b/packages/davinci-client/README.md
@@ -25,7 +25,7 @@ Configure DaVinci Client with the following minimum, required properties:
 
 ```ts
 // Demo with example values
-import { davinci } from '@forgerock/davinci';
+import { davinci } from '@forgerock/davinci-client';
 
 const davinciClient = await davinci({
   config: {
@@ -42,7 +42,7 @@ If you have a need for more than one client, say you need to use two or more dif
 
 ```ts
 // Demo with example values
-import { davinci } from '@forgerock/davinci';
+import { davinci } from '@forgerock/davinci-client';
 
 const firstDavinciClient = await davinci(/** config 1 **/);
 const secondDavinciClient = await davinci(/** config 2 **/);
@@ -63,6 +63,50 @@ interface DaVinciConfig {
 }
 ```
 
+### Sharing a store with another client
+
+If your application also uses `@forgerock/oidc-client`, the two can share one Redux store so the well-known discovery document is fetched once rather than once per client.
+
+`davinci()` exposes the store it created as `client.store`. Pass it to the other client:
+
+```ts
+import { davinci } from '@forgerock/davinci-client';
+import { oidc } from '@forgerock/oidc-client';
+
+const davinciClient = await davinci({ config });
+
+// Attaches to davinci's store; the discovery document is already cached there.
+const oidcClient = await oidc({ config: oidcConfig, store: davinciClient.store });
+```
+
+Or create the store yourself when neither client is the natural owner:
+
+```ts
+import { createSdkStore } from '@forgerock/sdk-store';
+
+const store = createSdkStore();
+const davinciClient = await davinci({ config, store });
+const oidcClient = await oidc({ config: oidcConfig, store });
+```
+
+Omitting `store` is always valid — the client creates its own, which is the default behaviour.
+
+#### Middleware and logging stay private
+
+Sharing a store shares cached data, not configuration. `requestMiddleware` and `logger` are registered against the client you pass them to, and are resolved only by that client's own requests:
+
+```ts
+const store = createSdkStore();
+
+// Runs for DAVINCI_START, DAVINCI_NEXT, DAVINCI_FLOW and the other DaVinci actions only.
+await davinci({ config, store, requestMiddleware: [davinciMiddleware] });
+
+// Runs for OIDC requests only.
+await oidc({ config: oidcConfig, store, requestMiddleware: [oidcMiddleware] });
+```
+
+Middleware passed here will never run against an OIDC token exchange, and vice versa.
+
 ### Start a DaVinci flow
 
 Call the `start` method on the returned client API:
@@ -182,10 +226,10 @@ Upon each collector in the array, some will need an `updater`, like the collecto
 
 ```ts
 // Example SingleValueCollector using the TextCollector
-const collectors = davinci.collectors();
+const collectors = davinciClient.getCollectors();
 collectors.map((collector) => {
   if (collector.type === 'TextCollector') {
-    renderTextCollector(collector, davinci.update(collector));
+    renderTextCollector(collector, davinciClient.update(collector));
   }
 });
 ```
@@ -214,7 +258,7 @@ The `SubmitCollector` is associated with the submission of the current node and
 
 ```ts
 // Example SubmitCollector mapping
-const collectors = davinci.collectors();
+const collectors = davinciClient.getCollectors();
 collectors.map((collector) => {
   if (collector.type === 'SubmitCollector') {
     renderSubmitCollector(
@@ -234,7 +278,7 @@ To do this, you call the `flow` method on the `davinciClient` passing the `key`
 
 ```ts
 // Example FlowCollector mapping
-const collectors = davinci.collectors();
+const collectors = davinciClient.getCollectors();
 collectors.map((collector) => {
   if (collector.type === 'FlowCollector') {
     renderFlowCollector(collector, davinciClient.flow(collector));
@@ -260,7 +304,7 @@ function renderFlowCollector(collector, startFlow) {
 After collecting the needed data, you proceed to the next node in the DaVinci flow by calling the `.next()` method on the same `davinci` client object. This can be the result of a user clicking on the button rendered from the `SubmitCollector`, from the "submit" event of the HTML form itself, or from programmatically triggering the submission in the application layer.
 
 ```ts
-let nextStep = davinci.next();
+const nextStep = await davinciClient.next();
 ```
 
 Note: There's no need to pass anything into the `next` method as the DaVinci Client internally stores the updated object needed for the server.
@@ -284,25 +328,12 @@ When you receive a success node, you will likely want to use the Authorization C
 Here's a brief sample of what that might look like in pseudocode:
 
 ```ts
-// ... other imports
-
-import { Config, TokenManager } from '@forgerock/javascript-sdk';
-
-// ... other config or initialization code
-
-// This Config.set accepts the same config schema as the davinci function
-Config.set(config);
-
-const node = await davinciClient.next();
-
-if (node.status === 'success') {
-  const clientInfo = davinciClient.getClient();
-
-  const code = clientInfo.authorization?.code || '';
-  const state = clientInfo.authorization?.state || '';
-
-  const tokens = await TokenManager.getTokens({ query: { code, state } });
-  // user now has session and OIDC tokens
+// oidcClient is an instance of oidc() from @forgerock/oidc-client, configured earlier
+const tokens = await oidcClient.token.exchange(code, state);
+if ('error' in tokens) {
+  console.error('Token exchange failed:', tokens.error);
+} else {
+  console.log('Access token:', tokens.accessToken);
 }
 ```
 
@@ -320,7 +351,7 @@ if (node.status === 'failure') {
   renderError(error);
 
   // ... user clicks button to restart flow
-  const freshNode = davinciClient.start();
+  const freshNode = await davinciClient.start();
 }
 ```
 
diff --git a/packages/davinci-client/api-report/davinci-client.api.md b/packages/davinci-client/api-report/davinci-client.api.md
index a8e738c5514..6f2938c9339 100644
--- a/packages/davinci-client/api-report/davinci-client.api.md
+++ b/packages/davinci-client/api-report/davinci-client.api.md
@@ -17,6 +17,7 @@ import type { MutationResultSelectorResult } from '@reduxjs/toolkit/query';
 import { QueryStatus } from '@reduxjs/toolkit/query';
 import { Reducer } from '@reduxjs/toolkit';
 import { RequestMiddleware } from '@forgerock/sdk-request-middleware';
+import type { SdkStore } from '@forgerock/sdk-store';
 import { SerializedError } from '@reduxjs/toolkit';
 import { Unsubscribe } from '@reduxjs/toolkit';
 
@@ -281,7 +282,12 @@ export function davinci<ActionType extends ActionTypes = ActionTypes>(input: {
         level: LogLevel;
         custom?: CustomLogger;
     };
+    store?: unknown;
 }): Promise<{
+    error: string;
+    type: "argument_error";
+} | {
+    store: SdkStore;
     subscribe: (listener: () => void) => Unsubscribe;
     externalIdp: () => (() => Promise<void | InternalErrorResponse>);
     flow: (action: DaVinciAction) => InitFlow;
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 d498f3a14f2..939ed7dfa53 100644
--- a/packages/davinci-client/api-report/davinci-client.types.api.md
+++ b/packages/davinci-client/api-report/davinci-client.types.api.md
@@ -16,6 +16,7 @@ import type { MutationResultSelectorResult } from '@reduxjs/toolkit/query';
 import { QueryStatus } from '@reduxjs/toolkit/query';
 import { Reducer } from '@reduxjs/toolkit';
 import { RequestMiddleware } from '@forgerock/sdk-request-middleware';
+import type { SdkStore } from '@forgerock/sdk-store';
 import { SerializedError } from '@reduxjs/toolkit';
 import { Unsubscribe } from '@reduxjs/toolkit';
 
@@ -280,7 +281,12 @@ export function davinci<ActionType extends ActionTypes = ActionTypes>(input: {
         level: LogLevel;
         custom?: CustomLogger;
     };
+    store?: unknown;
 }): Promise<{
+    error: string;
+    type: "argument_error";
+} | {
+    store: SdkStore;
     subscribe: (listener: () => void) => Unsubscribe;
     externalIdp: () => (() => Promise<void | InternalErrorResponse>);
     flow: (action: DaVinciAction) => InitFlow;
diff --git a/packages/davinci-client/package.json b/packages/davinci-client/package.json
index 0be513d2031..d85c08796d3 100644
--- a/packages/davinci-client/package.json
+++ b/packages/davinci-client/package.json
@@ -30,6 +30,7 @@
     "@forgerock/sdk-logger": "workspace:*",
     "@forgerock/sdk-oidc": "workspace:*",
     "@forgerock/sdk-request-middleware": "workspace:*",
+    "@forgerock/sdk-store": "workspace:*",
     "@forgerock/sdk-types": "workspace:*",
     "@forgerock/sdk-utilities": "workspace:*",
     "@forgerock/storage": "workspace:*",
diff --git a/packages/davinci-client/src/lib/client.store.effects.ts b/packages/davinci-client/src/lib/client.store.effects.ts
index 9923ea4b676..dc306345ec2 100644
--- a/packages/davinci-client/src/lib/client.store.effects.ts
+++ b/packages/davinci-client/src/lib/client.store.effects.ts
@@ -11,7 +11,8 @@ import { FetchBaseQueryError } from '@reduxjs/toolkit/query/react';
 
 import type { logger as loggerFn } from '@forgerock/sdk-logger';
 
-import type { ClientStore, RootState } from './client.store.utils.js';
+import type { DavinciStore } from './client.store.utils.js';
+import type { RootState } from './davinci.state.js';
 import type { PollingStatus, InternalErrorResponse } from './client.types.js';
 import type { PollingCollector } from './collector.types.js';
 
@@ -239,7 +240,7 @@ function challengePollingµ({
 }: {
   collector: PollingCollector;
   challenge: string;
-  store: ReturnType<ClientStore>;
+  store: DavinciStore;
   log: ReturnType<typeof loggerFn>;
 }): Micro.Micro<PollingStatus, InternalErrorResponse> {
   const maxRetries = collector.output.config.pollRetries ?? 60;
@@ -295,7 +296,7 @@ export function pollingµ({
 }: {
   mode: PollingMode;
   collector: PollingCollector;
-  store: ReturnType<ClientStore>;
+  store: DavinciStore;
   log: ReturnType<typeof loggerFn>;
 }): Micro.Micro<PollingStatus, InternalErrorResponse> {
   if (mode._tag === 'challenge') {
diff --git a/packages/davinci-client/src/lib/client.store.test.ts b/packages/davinci-client/src/lib/client.store.test.ts
index ef6c2a96237..a4f2a245365 100644
--- a/packages/davinci-client/src/lib/client.store.test.ts
+++ b/packages/davinci-client/src/lib/client.store.test.ts
@@ -123,6 +123,7 @@ describe('davinci client — cache', () => {
   describe('cache.getLatestResponse()', () => {
     it('returns a state_error when no flow has been started (no cache key)', async () => {
       const client = await davinci({ config: mockConfig });
+      if ('type' in client) throw new Error(`davinci() failed: ${client.error}`);
 
       // Node is in start status — cache.key is null before any start() call
       const result = client.cache.getLatestResponse();
@@ -132,6 +133,7 @@ describe('davinci client — cache', () => {
 
     it('returns the raw DaVinci response object — NOT a selector function — after start()', async () => {
       const client = await davinci({ config: mockConfig });
+      if ('type' in client) throw new Error(`davinci() failed: ${client.error}`);
       await client.start();
 
       const result = client.cache.getLatestResponse();
@@ -150,6 +152,7 @@ describe('davinci client — cache', () => {
   describe('cache.getResponseWithId()', () => {
     it('returns an argument_error when called with an empty string', async () => {
       const client = await davinci({ config: mockConfig });
+      if ('type' in client) throw new Error(`davinci() failed: ${client.error}`);
 
       const result = client.cache.getResponseWithId('');
 
@@ -158,6 +161,7 @@ describe('davinci client — cache', () => {
 
     it('returns the raw DaVinci response object — NOT a selector function — for a valid request ID', async () => {
       const client = await davinci({ config: mockConfig });
+      if ('type' in client) throw new Error(`davinci() failed: ${client.error}`);
       await client.start();
 
       const node = client.getNode();
@@ -175,6 +179,7 @@ describe('davinci client — cache', () => {
 
     it('returns a state_error for a requestId not present in cache', async () => {
       const client = await davinci({ config: mockConfig });
+      if ('type' in client) throw new Error(`davinci() failed: ${client.error}`);
 
       const result = client.cache.getResponseWithId('non-existent-id');
 
diff --git a/packages/davinci-client/src/lib/client.store.ts b/packages/davinci-client/src/lib/client.store.ts
index c92def90d84..6bd2ae6b974 100644
--- a/packages/davinci-client/src/lib/client.store.ts
+++ b/packages/davinci-client/src/lib/client.store.ts
@@ -19,15 +19,16 @@ import {
   handleUpdateValidateError,
   isValidCollectorCategory,
   resolveCollectorUpdateValue,
-  type RootState,
 } from './client.store.utils.js';
+import type { RootState } from './davinci.state.js';
 import { pollingµ, getPollingModeµ } from './client.store.effects.js';
 import { nodeSlice } from './node.slice.js';
 import { davinciApi } from './davinci.api.js';
 import { configSlice } from './config.slice.js';
-import { wellknownApi } from './wellknown.api.js';
+import { wellknownApi, assertValidStore } from '@forgerock/sdk-store';
 
 import type { ActionTypes, RequestMiddleware } from '@forgerock/sdk-request-middleware';
+import type { SdkStore } from '@forgerock/sdk-store';
 /**
  * Import the DaVinciRequest types
  */
@@ -71,6 +72,7 @@ export async function davinci<ActionType extends ActionTypes = ActionTypes>({
   config,
   requestMiddleware,
   logger,
+  store: sharedStore,
 }: {
   config: DaVinciConfig;
   requestMiddleware?: RequestMiddleware<ActionType>[];
@@ -78,16 +80,22 @@ export async function davinci<ActionType extends ActionTypes = ActionTypes>({
     level: LogLevel;
     custom?: CustomLogger;
   };
+  /**
+   * An existing SDK store to attach to, so discovery caching and state are
+   * shared with another client. Omit to create a store for this client alone.
+   */
+  store?: unknown;
 }) {
   const log = loggerFn({
     level: logger?.level ?? config.log ?? 'error',
     custom: logger?.custom,
   });
-  const store = createClientStore({ requestMiddleware, logger: log });
-  const serverInfo = createStorage<ContinueNode['server']>({
-    type: 'localStorage',
-    name: 'serverInfo',
-  });
+
+  const storeError = assertValidStore(sharedStore);
+  if (storeError) return storeError;
+
+  const validStore = sharedStore as SdkStore | undefined;
+
   if (!config.serverConfig.wellknown) {
     const error = new Error(
       '`wellknown` property is a required as part of the `config.serverConfig`',
@@ -102,6 +110,13 @@ export async function davinci<ActionType extends ActionTypes = ActionTypes>({
     throw error;
   }
 
+  const handle = createClientStore({ requestMiddleware, logger: log, store: validStore });
+  const store = handle.store;
+  const serverInfo = createStorage<ContinueNode['server']>({
+    type: 'localStorage',
+    name: 'serverInfo',
+  });
+
   const { data: openIdResponse, error: fetchError } = await store.dispatch(
     wellknownApi.endpoints.configuration.initiate(config.serverConfig.wellknown),
   );
@@ -115,6 +130,8 @@ export async function davinci<ActionType extends ActionTypes = ActionTypes>({
   store.dispatch(configSlice.actions.set({ ...config, wellknownResponse: openIdResponse }));
 
   return {
+    /** Pass to another SDK client's `store` option to share this store. */
+    store: handle as SdkStore,
     // Pass store methods to the client
     subscribe: store.subscribe,
 
diff --git a/packages/davinci-client/src/lib/client.store.utils.ts b/packages/davinci-client/src/lib/client.store.utils.ts
index ae6034f2464..91af0c3b4e3 100644
--- a/packages/davinci-client/src/lib/client.store.utils.ts
+++ b/packages/davinci-client/src/lib/client.store.utils.ts
@@ -4,21 +4,13 @@
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
  */
-import { configureStore } from '@reduxjs/toolkit';
 import { Match, Either } from 'effect';
 
 import type { ActionTypes, RequestMiddleware } from '@forgerock/sdk-request-middleware';
 import type { logger as loggerFn } from '@forgerock/sdk-logger';
 import type { GenericError } from '@forgerock/sdk-types';
 
-import type {
-  ErrorNode,
-  ContinueNode,
-  StartNode,
-  SuccessNode,
-  Collectors,
-  CollectorCategory,
-} from './node.types.js';
+import type { Collectors, CollectorCategory } from './node.types.js';
 import type {
   CollectorValueType,
   CollectorValueTypes,
@@ -26,54 +18,45 @@ import type {
   UpdatableCollectors,
 } from './client.types.js';
 
+import { createSdkStore, injectClient } from '@forgerock/sdk-store';
+import type { SdkStore, SdkStoreHandle } from '@forgerock/sdk-store';
+
 import { configSlice } from './config.slice.js';
 import { nodeSlice } from './node.slice.js';
 import { davinciApi } from './davinci.api.js';
-import { wellknownApi } from './wellknown.api.js';
 
+import type { RootState } from './davinci.state.js';
+
+/**
+ * Creates, or attaches to, the store backing a DaVinci client.
+ *
+ * Passing `store` attaches to an existing SDK store so that discovery caching
+ * and state are shared; omitting it creates one, which is the default.
+ */
 export function createClientStore<ActionType extends ActionTypes>({
   requestMiddleware,
   logger,
+  store,
 }: {
   requestMiddleware?: RequestMiddleware<ActionType, unknown>[];
   logger?: ReturnType<typeof loggerFn>;
-}) {
-  return configureStore({
-    reducer: {
-      config: configSlice.reducer,
-      node: nodeSlice.reducer,
-      [davinciApi.reducerPath]: davinciApi.reducer,
-      [wellknownApi.reducerPath]: wellknownApi.reducer,
-    },
-    middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware({
-        thunk: {
-          extraArgument: {
-            /**
-             * This becomes the `api.extra` argument, and will be passed into the
-             * customer query wrapper for `baseQuery`
-             */
-            requestMiddleware,
-            logger,
-          },
-        },
-      })
-        .concat(davinciApi.middleware)
-        .concat(wellknownApi.middleware),
+  store?: SdkStore;
+}): SdkStoreHandle<RootState> {
+  return injectClient<RootState>(store ?? createSdkStore(), {
+    api: davinciApi,
+    reducerPath: davinciApi.reducerPath,
+    slices: [configSlice, nodeSlice],
+    requestMiddleware,
+    logger,
   });
 }
 
 export type ClientStore = typeof createClientStore;
 
-export type RootState = ReturnType<ReturnType<ClientStore>['getState']>;
-
-export interface RootStateWithNode<
-  T extends ErrorNode | ContinueNode | StartNode | SuccessNode,
-> extends RootState {
-  node: T;
-}
+/** The inner Redux store type — used by effects that need dispatch/getState. */
+export type DavinciStore = SdkStoreHandle<RootState>['store'];
 
-export type AppDispatch = ReturnType<ReturnType<ClientStore>['dispatch']>;
+export type AppDispatch = DavinciStore['dispatch'];
 
 /**
  * @function createInternalError
diff --git a/packages/davinci-client/src/lib/davinci.api.ts b/packages/davinci-client/src/lib/davinci.api.ts
index 05e94872ef6..403ead99763 100644
--- a/packages/davinci-client/src/lib/davinci.api.ts
+++ b/packages/davinci-client/src/lib/davinci.api.ts
@@ -25,13 +25,14 @@ import { createAuthorizeUrl } from '@forgerock/sdk-oidc';
 
 import { handleResponse, transformActionRequest, transformSubmitRequest } from './davinci.utils.js';
 
-import type { logger as loggerFn } from '@forgerock/sdk-logger';
+import { logger as loggerFn } from '@forgerock/sdk-logger';
+import { clientExtra } from '@forgerock/sdk-store';
 import type { ActionTypes, RequestMiddleware } from '@forgerock/sdk-request-middleware';
 
 /**
  * Import the DaVinci types
  */
-import type { RootStateWithNode } from './client.store.utils.js';
+import type { RootStateWithNode } from './davinci.state.js';
 import type {
   DaVinciCacheEntry,
   OutgoingQueryParams,
@@ -47,9 +48,34 @@ type BaseQueryResponse = Promise<
   QueryReturnValue<unknown, FetchBaseQueryError, FetchBaseQueryMeta>
 >;
 
+const DAVINCI_REDUCER_PATH = 'davinci';
+
+/**
+ * This client's private slot on the store's `extraArgument`.
+ *
+ * Both fields are optional because a shared store may not have had a davinci
+ * slot registered yet; `davinciExtra` substitutes safe defaults so an endpoint
+ * can never fail on a missing slot.
+ */
 interface Extras<ActionType extends ActionTypes = ActionTypes, Payload = unknown> {
-  requestMiddleware: RequestMiddleware<ActionType, Payload>[];
-  logger: ReturnType<typeof loggerFn>;
+  requestMiddleware?: RequestMiddleware<ActionType, Payload>[];
+  logger?: ReturnType<typeof loggerFn>;
+}
+
+/** Fallback so a missing slot degrades to error-level logging, never a crash. */
+const fallbackLogger = loggerFn({ level: 'error' });
+
+/**
+ * Resolves this client's own middleware and logger.
+ *
+ * Reads only the `davinci` slot — never a store-wide value, which on a shared
+ * store would belong to whichever client created it.
+ */
+function davinciExtra(extra: unknown): Required<Extras> {
+  return clientExtra(extra, DAVINCI_REDUCER_PATH, {
+    requestMiddleware: [],
+    logger: fallbackLogger,
+  });
 }
 
 /**
@@ -57,7 +83,7 @@ interface Extras<ActionType extends ActionTypes = ActionTypes, Payload = unknown
  * @see https://redux-toolkit.js.org/rtk-query/overview
  */
 export const davinciApi = createApi({
-  reducerPath: 'davinci',
+  reducerPath: DAVINCI_REDUCER_PATH,
   // TODO: implement extraOptions for request interceptors: https://stackoverflow.com/a/77569083 & https://stackoverflow.com/a/65129117
   baseQuery: fetchBaseQuery({
     prepareHeaders: (headers) => {
@@ -81,9 +107,9 @@ export const davinciApi = createApi({
         const requestBody = transformActionRequest(
           state.node,
           params.action,
-          (api.extra as Extras).logger,
+          davinciExtra(api.extra).logger,
         );
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = davinciExtra(api.extra);
 
         let href = '';
 
@@ -126,7 +152,7 @@ export const davinciApi = createApi({
        * parameters are pre-typed from the library.
        */
       async onQueryStarted(_, api) {
-        const logger = (api.extra as Extras).logger;
+        const { logger } = davinciExtra(api.extra);
         let response;
 
         try {
@@ -160,7 +186,7 @@ export const davinciApi = createApi({
       async queryFn(body, api, __, baseQuery) {
         const state = api.getState() as RootStateWithNode<ContinueNode>;
         const links = state.node.server._links;
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = davinciExtra(api.extra);
 
         let requestBody;
         let href = '';
@@ -237,7 +263,7 @@ export const davinciApi = createApi({
        * parameters are pre-typed from the library.
        */
       async onQueryStarted(_, api) {
-        const logger = (api.extra as Extras).logger;
+        const { logger } = davinciExtra(api.extra);
         let response;
 
         try {
@@ -270,7 +296,7 @@ export const davinciApi = createApi({
        * @method queryFn - This is just a wrapper around the fetch call
        */
       async queryFn(options, api, __, baseQuery) {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = davinciExtra(api.extra);
         const state = api.getState() as RootStateWithNode<StartNode>;
 
         if (!state) {
@@ -352,7 +378,7 @@ export const davinciApi = createApi({
        * parameters are pre-typed from the library.
        */
       async onQueryStarted(_, api) {
-        const logger = (api.extra as Extras).logger;
+        const { logger } = davinciExtra(api.extra);
         let response;
 
         try {
@@ -381,7 +407,7 @@ export const davinciApi = createApi({
      */
     resume: builder.query<unknown, { serverInfo: ContinueNode['server']; continueToken: string }>({
       async queryFn({ serverInfo, continueToken }, api, _c, baseQuery) {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = davinciExtra(api.extra);
         const links = serverInfo._links;
 
         if (!continueToken) {
@@ -430,7 +456,7 @@ export const davinciApi = createApi({
         return response;
       },
       async onQueryStarted(_, api) {
-        const logger = (api.extra as Extras).logger;
+        const { logger } = davinciExtra(api.extra);
         let response;
 
         try {
@@ -464,7 +490,7 @@ export const davinciApi = createApi({
      */
     poll: builder.mutation<unknown, { endpoint: string; interactionId: string }>({
       async queryFn({ endpoint, interactionId }, api, _c, baseQuery) {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = davinciExtra(api.extra);
 
         const request: FetchArgs = {
           url: endpoint,
diff --git a/packages/davinci-client/src/lib/davinci.state.ts b/packages/davinci-client/src/lib/davinci.state.ts
new file mode 100644
index 00000000000..9b4a2dbfbc2
--- /dev/null
+++ b/packages/davinci-client/src/lib/davinci.state.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { combineSlices } from '@reduxjs/toolkit';
+
+import { configSlice } from './config.slice.js';
+import { nodeSlice } from './node.slice.js';
+import { davinciApi } from './davinci.api.js';
+import { wellknownApi } from '@forgerock/sdk-store';
+
+import type { ErrorNode, ContinueNode, StartNode, SuccessNode } from './node.types.js';
+
+/**
+ * The canonical description of the state this client contributes.
+ *
+ * Isolated into its own module to prevent a circular dependency:
+ * `node.reducer.ts` → `client.store.utils.ts` → `node.slice.ts` would cycle.
+ * Nothing that `node.reducer.ts` imports should import from this file.
+ */
+export const rootReducer = combineSlices(configSlice, nodeSlice, davinciApi, wellknownApi);
+
+export type RootState = ReturnType<typeof rootReducer>;
+
+export interface RootStateWithNode<
+  T extends ErrorNode | ContinueNode | StartNode | SuccessNode,
+> extends RootState {
+  node: T;
+}
diff --git a/packages/davinci-client/src/lib/store-shape.test.ts b/packages/davinci-client/src/lib/store-shape.test.ts
new file mode 100644
index 00000000000..69b1885332f
--- /dev/null
+++ b/packages/davinci-client/src/lib/store-shape.test.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { describe, expect, it } from 'vitest';
+
+import { createClientStore } from './client.store.utils.js';
+
+/**
+ * `combineSlices` keys each reducer off `slice.reducerPath ?? slice.name`, where
+ * the previous `configureStore({ reducer: { ... } })` form spelled the keys out
+ * literally. That makes the published state shape an implicit consequence of
+ * slice metadata: renaming `nodeSlice.name` would silently reshape the store.
+ *
+ * These assertions pin the shape so such a rename fails loudly here instead of
+ * in a consumer's selectors.
+ */
+describe('davinci store shape', () => {
+  it('exposes exactly the expected top-level state keys', () => {
+    // Arrange
+    const { store } = createClientStore({});
+
+    // Act
+    const keys = Object.keys(store.getState()).sort();
+
+    // Assert
+    expect(keys).toEqual(['config', 'davinci', 'node', 'wellknown']);
+  });
+
+  it('registers this client\u2019s slot on the store extra, keyed by reducerPath', async () => {
+    // Arrange
+    const { store } = createClientStore({});
+    let observed: unknown;
+
+    // Act — a thunk is the supported way to observe extraArgument
+    await store.dispatch(((_dispatch: unknown, _getState: unknown, extra: unknown) => {
+      observed = extra;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    }) as any);
+
+    // Assert
+    expect(observed).toHaveProperty('clients.davinci');
+  });
+});
diff --git a/packages/davinci-client/src/lib/wellknown.api.ts b/packages/davinci-client/src/lib/wellknown.api.ts
index 8b9772094ed..5e7b28ba498 100644
--- a/packages/davinci-client/src/lib/wellknown.api.ts
+++ b/packages/davinci-client/src/lib/wellknown.api.ts
@@ -7,7 +7,7 @@
 
 import { createSelector } from '@reduxjs/toolkit';
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query';
-import { initWellknownQuery } from '@forgerock/sdk-oidc';
+import { initWellknownQuery } from '@forgerock/sdk-store';
 
 import type { WellknownResponse } from '@forgerock/sdk-types';
 import type {
@@ -19,7 +19,7 @@ import type {
 /**
  * RTK Query API for well-known endpoint discovery.
  *
- * Uses the `initWellknownQuery` builder pattern from `@forgerock/sdk-oidc`.
+ * Uses the `initWellknownQuery` builder pattern from `@forgerock/sdk-store`.
  * The builder constructs the request and validates the response;
  * `fetchBaseQuery` handles the HTTP transport through RTK Query's pipeline.
  */
diff --git a/packages/davinci-client/tsconfig.json b/packages/davinci-client/tsconfig.json
index 141b4ebf5f8..df687466594 100644
--- a/packages/davinci-client/tsconfig.json
+++ b/packages/davinci-client/tsconfig.json
@@ -23,6 +23,9 @@
     {
       "path": "../sdk-effects/sdk-request-middleware"
     },
+    {
+      "path": "../sdk-effects/store"
+    },
     {
       "path": "../sdk-effects/oidc"
     },
diff --git a/packages/davinci-client/tsconfig.lib.json b/packages/davinci-client/tsconfig.lib.json
index 6c7bbdefeff..6db7b33e75b 100644
--- a/packages/davinci-client/tsconfig.lib.json
+++ b/packages/davinci-client/tsconfig.lib.json
@@ -48,6 +48,9 @@
     },
     {
       "path": "../sdk-effects/logger/tsconfig.lib.json"
+    },
+    {
+      "path": "../sdk-effects/store/tsconfig.lib.json"
     }
   ]
 }
diff --git a/packages/journey-client/README.md b/packages/journey-client/README.md
index 910ca9462ee..919deeb07b2 100644
--- a/packages/journey-client/README.md
+++ b/packages/journey-client/README.md
@@ -13,6 +13,7 @@
 - [API Reference](#api-reference)
 - [Working with Callbacks](#working-with-callbacks)
 - [Request Middleware](#request-middleware)
+- [Sharing a Store With Another Client](#sharing-a-store-with-another-client)
 - [Error Handling](#error-handling)
 - [Building](#building)
 - [Testing](#testing)
@@ -116,12 +117,13 @@ const client = await journey({
   config: JourneyClientConfig,
   requestMiddleware?: RequestMiddleware[],
   logger?: { level: LogLevel; custom?: CustomLogger },
+  store?: SdkStore,
 });
 ```
 
 **Returns**: `Promise<JourneyClient>`
 
-**Throws**: `Error` if the wellknown URL is invalid, the fetch fails, or the server is not a ForgeRock AM instance.
+**Throws**: `Error` if the wellknown URL is invalid, the fetch fails, or the server is not a ForgeRock AM instance. Throws if the `store` argument is provided but is not a valid `SdkStore` handle.
 
 ```typescript
 try {
@@ -232,6 +234,50 @@ const client = await journey({
 | `JOURNEY_NEXT`      | Submitting a step       |
 | `JOURNEY_TERMINATE` | Terminating the session |
 
+## Sharing a Store With Another Client
+
+If your application also uses `@forgerock/oidc-client`, the two can share one Redux store so the well-known discovery document is fetched once rather than once per client.
+
+`journey()` exposes the store it created as `client.store`. Pass it to the other client:
+
+```typescript
+import { journey } from '@forgerock/journey-client';
+import { oidc } from '@forgerock/oidc-client';
+
+const journeyClient = await journey({ config });
+
+// Attaches to journey's store; the discovery document is already cached there.
+const oidcClient = await oidc({ config: oidcConfig, store: journeyClient.store });
+```
+
+Or create the store yourself when neither client is the natural owner:
+
+```typescript
+import { createSdkStore } from '@forgerock/sdk-store';
+
+const store = createSdkStore();
+const journeyClient = await journey({ config, store });
+const oidcClient = await oidc({ config: oidcConfig, store });
+```
+
+Omitting `store` is always valid — the client creates its own, which is the default behaviour.
+
+### Middleware and logging stay private
+
+Sharing a store shares cached data, not configuration. `requestMiddleware` and `logger` are registered against the client you pass them to, and are resolved only by that client's own requests:
+
+```typescript
+const store = createSdkStore();
+
+// Runs for JOURNEY_START, JOURNEY_NEXT and JOURNEY_TERMINATE only.
+await journey({ config, store, requestMiddleware: [journeyMiddleware] });
+
+// Runs for OIDC requests only.
+await oidc({ config: oidcConfig, store, requestMiddleware: [oidcMiddleware] });
+```
+
+Middleware passed here will never run against an OIDC token exchange, and vice versa.
+
 ## Error Handling
 
 The `journey()` factory throws on initialization failure. Use try/catch:
diff --git a/packages/journey-client/api-report/journey-client.api.md b/packages/journey-client/api-report/journey-client.api.md
index 6ef87d5d185..8af828a4d4c 100644
--- a/packages/journey-client/api-report/journey-client.api.md
+++ b/packages/journey-client/api-report/journey-client.api.md
@@ -1,508 +1,513 @@
-## API Report File for "@forgerock/journey-client"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-import { ActionTypes } from '@forgerock/sdk-request-middleware';
-import { AuthResponse } from '@forgerock/sdk-types';
-import { Callback } from '@forgerock/sdk-types';
-import { CallbackType } from '@forgerock/sdk-types';
-import { callbackType } from '@forgerock/sdk-types';
-import { createWellknownError } from '@forgerock/sdk-utilities';
-import { CustomLogger } from '@forgerock/sdk-logger';
-import { FailedPolicyRequirement } from '@forgerock/sdk-types';
-import { FailureDetail } from '@forgerock/sdk-types';
-import { GenericError } from '@forgerock/sdk-types';
-import { isValidWellknownUrl } from '@forgerock/sdk-utilities';
-import { JourneyClientConfig } from '@forgerock/sdk-types';
-import { JourneyServerConfig } from '@forgerock/sdk-types';
-import { LegacyServerConfig } from '@forgerock/sdk-types';
-import { LogLevel } from '@forgerock/sdk-logger';
-import { makeJourneyConfig } from '@forgerock/sdk-utilities';
-import { NameValue } from '@forgerock/sdk-types';
-import { PolicyKey } from '@forgerock/sdk-types';
-import { PolicyParams } from '@forgerock/sdk-types';
-import { PolicyRequirement } from '@forgerock/sdk-types';
-import { RequestMiddleware } from '@forgerock/sdk-request-middleware';
-import { Step } from '@forgerock/sdk-types';
-import { StepDetail } from '@forgerock/sdk-types';
-import { StepType } from '@forgerock/sdk-types';
-import { WellknownResponse } from '@forgerock/sdk-types';
-
-export { ActionTypes };
-
-// @public
-export class AttributeInputCallback<T extends string | number | boolean> extends BaseCallback {
-  constructor(payload: Callback);
-  getFailedPolicies(): PolicyRequirement[];
-  getName(): string;
-  getPolicies(): Record<string, unknown>;
-  getPrompt(): string;
-  isRequired(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setValidateOnly(value: boolean): void;
-  setValue(value: T): void;
-}
-
-export { AuthResponse };
-
-// @public
-export class BaseCallback {
-  constructor(payload: Callback);
-  getInputValue(selector?: number | string): unknown;
-  getOutputByName<T>(name: string, defaultValue: T): T;
-  getOutputValue(selector?: number | string): unknown;
-  getType(): CallbackType;
-  // (undocumented)
-  payload: Callback;
-  setInputValue(value: unknown, selector?: number | string | RegExp): void;
-}
-
-export { Callback };
-
-// @public (undocumented)
-export type CallbackFactory = (callback: Callback) => BaseCallback;
-
-export { CallbackType };
-
-export { callbackType };
-
-// @public
-export class ChoiceCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getChoices(): string[];
-  getDefaultChoice(): number;
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setChoiceIndex(index: number): void;
-  setChoiceValue(value: string): void;
-}
-
-// @public
-export class ConfirmationCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getDefaultOption(): number;
-  getMessageType(): number;
-  getOptions(): string[];
-  getOptionType(): number;
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setOptionIndex(index: number): void;
-  setOptionValue(value: string): void;
-}
-
-// @public (undocumented)
-export function createCallback(callback: Callback): BaseCallback;
-
-// @public (undocumented)
-export function createJourneyStep(payload: Step, callbackFactory?: CallbackFactory): JourneyStep;
-
-export { createWellknownError };
-
-export { CustomLogger };
-
-// @public
-export class DeviceProfileCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getMessage(): string;
-  isLocationRequired(): boolean;
-  isMetadataRequired(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setProfile(profile: DeviceProfileData): void;
-}
-
-// @public (undocumented)
-export interface DeviceProfileData {
-  // (undocumented)
-  identifier: string;
-  // (undocumented)
-  location?: Geolocation_2 | Record<string, unknown>;
-  // (undocumented)
-  metadata?: {
-    hardware: {
-      display: {
-        [key: string]: string | number | null;
-      };
-      [key: string]: any;
-    };
-    browser: {
-      [key: string]: string | number | null;
-    };
-    platform: {
-      [key: string]: string | number | null;
-    };
-  };
-}
-
-export { FailedPolicyRequirement };
-
-export { FailureDetail };
-
-export { GenericError };
-
-// @public (undocumented)
-interface Geolocation_2 {
-  // (undocumented)
-  latitude: number;
-  // (undocumented)
-  longitude: number;
-}
-export { Geolocation_2 as Geolocation };
-
-// @public
-export class HiddenValueCallback extends BaseCallback {
-  constructor(payload: Callback);
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public (undocumented)
-export interface IdPValue {
-  // (undocumented)
-  provider: string;
-  // (undocumented)
-  uiConfig: {
-    [key: string]: string;
-  };
-}
-
-// @internal
-export interface InternalJourneyClientConfig {
-  // (undocumented)
-  error?: GenericError;
-  // (undocumented)
-  serverConfig: ResolvedServerConfig;
-}
-
-export { isValidWellknownUrl };
-
-// @public
-export function journey<ActionType extends ActionTypes = ActionTypes>(input: {
-  config: JourneyClientConfig;
-  requestMiddleware?: RequestMiddleware<ActionType>[];
-  logger?: {
-    level: LogLevel;
-    custom?: CustomLogger;
-  };
-}): Promise<JourneyClient>;
-
-// @public
-export interface JourneyClient {
-  // (undocumented)
-  next: (step: JourneyStep, options?: NextOptions) => Promise<JourneyResult>;
-  // (undocumented)
-  redirect: (step: JourneyStep) => Promise<void>;
-  // (undocumented)
-  resume: (url: string, options?: ResumeOptions) => Promise<JourneyResult>;
-  // (undocumented)
-  start: (options?: StartParam) => Promise<JourneyResult>;
-  // (undocumented)
-  subscribe: (listener: () => void) => () => void;
-  // (undocumented)
-  terminate: (options?: { query?: Record<string, string> }) => Promise<void | GenericError>;
-}
-
-export { JourneyClientConfig };
-
-// @public (undocumented)
-export type JourneyLoginFailure = AuthResponse & {
-  type: StepType.LoginFailure;
-  payload: Step;
-  getCode: () => number;
-  getDetail: () => FailureDetail | undefined;
-  getMessage: () => string | undefined;
-  getProcessedMessage: (messageCreator?: MessageCreator) => ProcessedPropertyError[];
-  getReason: () => string | undefined;
-};
-
-// @public (undocumented)
-export type JourneyLoginSuccess = AuthResponse & {
-  type: StepType.LoginSuccess;
-  payload: Step;
-  getRealm: () => string | undefined;
-  getSessionToken: () => string | undefined;
-  getSuccessUrl: () => string | undefined;
-};
-
-// @public (undocumented)
-export type JourneyResult = JourneyStep | JourneyLoginSuccess | JourneyLoginFailure | GenericError;
-
-export { JourneyServerConfig };
-
-// @public (undocumented)
-export type JourneyStep = AuthResponse & {
-  type: StepType.Step;
-  payload: Step;
-  callbacks: BaseCallback[];
-  getCallbackOfType: <T extends BaseCallback>(type: CallbackType) => T;
-  getCallbacksOfType: <T extends BaseCallback>(type: CallbackType) => T[];
-  setCallbackValue: (type: CallbackType, value: unknown) => void;
-  getDescription: () => string | undefined;
-  getHeader: () => string | undefined;
-  getStage: () => string | undefined;
-};
-
-// @public
-export class KbaCreateCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getPredefinedQuestions(): string[];
-  getPrompt(): string;
-  isAllowedUserDefinedQuestions(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setAnswer(answer: string): void;
-  setQuestion(question: string): void;
-}
-
-export { LegacyServerConfig };
-
-export { LogLevel };
-
-// @public (undocumented)
-export interface MessageCreator {
-  // (undocumented)
-  [key: string]: (
-    propertyName: string,
-    params?: {
-      [key: string]: unknown;
-    },
-  ) => string;
-}
-
-// @public
-export class MetadataCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getData<T>(): T;
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public
-export class NameCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setName(name: string): void;
-}
-
-export { NameValue };
-
-// @public (undocumented)
-export interface NextOptions {
-  // (undocumented)
-  query?: Record<string, string>;
-}
-
-// @public
-export class PasswordCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getFailedPolicies(): PolicyRequirement[];
-  getPolicies(): string[];
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setPassword(password: string): void;
-}
-
-// @public
-export class PingOneProtectEvaluationCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getPauseBehavioralData(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setClientError(errorMessage: string): void;
-  setData(data: string): void;
-}
-
-// @public
-export class PingOneProtectInitializeCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getConfig():
-    | Record<string, string>
-    | {
-        envId: string;
-        consoleLogEnabled: boolean;
-        deviceAttributesToIgnore: string[];
-        customHost: string;
-        lazyMetadata: boolean;
-        behavioralDataCollection: boolean;
-        deviceKeyRsyncIntervals: number;
-        enableTrust: boolean;
-        disableTags: boolean;
-        disableHub: boolean;
-      };
-  // (undocumented)
-  payload: Callback;
-  // (undocumented)
-  setClientError(errorMessage: string): void;
-}
-
-export { PolicyKey };
-
-export { PolicyParams };
-
-export { PolicyRequirement };
-
-// @public
-export class PollingWaitCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getMessage(): string;
-  getWaitTime(): number;
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public (undocumented)
-export interface ProcessedPropertyError {
-  // (undocumented)
-  detail: FailedPolicyRequirement;
-  // (undocumented)
-  messages: string[];
-}
-
-// @public
-export class ReCaptchaCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getSiteKey(): string;
-  // (undocumented)
-  payload: Callback;
-  setResult(result: string): void;
-}
-
-// @public
-export class ReCaptchaEnterpriseCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getApiUrl(): string;
-  getElementClass(): string;
-  getSiteKey(): string;
-  // (undocumented)
-  payload: Callback;
-  setAction(action: string): void;
-  setClientError(error: string): void;
-  setPayload(payload: unknown): void;
-  setResult(result: string): void;
-}
-
-// @public
-export class RedirectCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getRedirectUrl(): string;
-  // (undocumented)
-  payload: Callback;
-}
-
-export { RequestMiddleware };
-
-// @public
-export interface ResolvedServerConfig {
-  // (undocumented)
-  baseUrl: string;
-  // (undocumented)
-  paths: {
-    authenticate: string;
-    sessions: string;
-  };
-}
-
-// @public (undocumented)
-export interface ResumeOptions {
-  // (undocumented)
-  journey?: string;
-  // (undocumented)
-  query?: Record<string, string>;
-}
-
-// @public
-export class SelectIdPCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getProviders(): IdPValue[];
-  // (undocumented)
-  payload: Callback;
-  setProvider(value: string): void;
-}
-
-// @public (undocumented)
-export interface StartParam {
-  // (undocumented)
-  journey: string;
-  // (undocumented)
-  query?: Record<string, string>;
-}
-
-export { Step };
-
-export { StepDetail };
-
-export { StepType };
-
-// @public
-export class SuspendedTextOutputCallback extends TextOutputCallback {
-  constructor(payload: Callback);
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public
-export class TermsAndConditionsCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getCreateDate(): Date | null;
-  getTerms(): string;
-  getVersion(): string;
-  // (undocumented)
-  payload: Callback;
-  setAccepted(accepted?: boolean): void;
-}
-
-// @public
-export class TextInputCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setInput(input: string): void;
-}
-
-// @public
-export class TextOutputCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getMessage(): string;
-  getMessageType(): string;
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public
-export class ValidatedCreatePasswordCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getFailedPolicies(): PolicyRequirement[];
-  getPolicies(): Record<string, any>;
-  getPrompt(): string;
-  isRequired(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setPassword(password: string): void;
-  setValidateOnly(value: boolean): void;
-}
-
-// @public
-export class ValidatedCreateUsernameCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getFailedPolicies(): PolicyRequirement[];
-  getPolicies(): Record<string, any>;
-  getPrompt(): string;
-  isRequired(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setName(name: string): void;
-  setValidateOnly(value: boolean): void;
-}
-
-export { WellknownResponse };
-
-// (No @packageDocumentation comment for this package)
-```
+## API Report File for "@forgerock/journey-client"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { ActionTypes } from '@forgerock/sdk-request-middleware';
+import { AuthResponse } from '@forgerock/sdk-types';
+import { Callback } from '@forgerock/sdk-types';
+import { CallbackType } from '@forgerock/sdk-types';
+import { callbackType } from '@forgerock/sdk-types';
+import { createWellknownError } from '@forgerock/sdk-utilities';
+import { CustomLogger } from '@forgerock/sdk-logger';
+import { FailedPolicyRequirement } from '@forgerock/sdk-types';
+import { FailureDetail } from '@forgerock/sdk-types';
+import { GenericError } from '@forgerock/sdk-types';
+import { isValidWellknownUrl } from '@forgerock/sdk-utilities';
+import { JourneyClientConfig } from '@forgerock/sdk-types';
+import { JourneyServerConfig } from '@forgerock/sdk-types';
+import { LegacyServerConfig } from '@forgerock/sdk-types';
+import { LogLevel } from '@forgerock/sdk-logger';
+import { makeJourneyConfig } from '@forgerock/sdk-utilities';
+import { NameValue } from '@forgerock/sdk-types';
+import { PolicyKey } from '@forgerock/sdk-types';
+import { PolicyParams } from '@forgerock/sdk-types';
+import { PolicyRequirement } from '@forgerock/sdk-types';
+import { RequestMiddleware } from '@forgerock/sdk-request-middleware';
+import type { SdkStore } from '@forgerock/sdk-store';
+import { Step } from '@forgerock/sdk-types';
+import { StepDetail } from '@forgerock/sdk-types';
+import { StepType } from '@forgerock/sdk-types';
+import { WellknownResponse } from '@forgerock/sdk-types';
+
+export { ActionTypes }
+
+// @public
+export class AttributeInputCallback<T extends string | number | boolean> extends BaseCallback {
+    constructor(payload: Callback);
+    getFailedPolicies(): PolicyRequirement[];
+    getName(): string;
+    getPolicies(): Record<string, unknown>;
+    getPrompt(): string;
+    isRequired(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setValidateOnly(value: boolean): void;
+    setValue(value: T): void;
+}
+
+export { AuthResponse }
+
+// @public
+export class BaseCallback {
+    constructor(payload: Callback);
+    getInputValue(selector?: number | string): unknown;
+    getOutputByName<T>(name: string, defaultValue: T): T;
+    getOutputValue(selector?: number | string): unknown;
+    getType(): CallbackType;
+    // (undocumented)
+    payload: Callback;
+    setInputValue(value: unknown, selector?: number | string | RegExp): void;
+}
+
+export { Callback }
+
+// @public (undocumented)
+export type CallbackFactory = (callback: Callback) => BaseCallback;
+
+export { CallbackType }
+
+export { callbackType }
+
+// @public
+export class ChoiceCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getChoices(): string[];
+    getDefaultChoice(): number;
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setChoiceIndex(index: number): void;
+    setChoiceValue(value: string): void;
+}
+
+// @public
+export class ConfirmationCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getDefaultOption(): number;
+    getMessageType(): number;
+    getOptions(): string[];
+    getOptionType(): number;
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setOptionIndex(index: number): void;
+    setOptionValue(value: string): void;
+}
+
+// @public (undocumented)
+export function createCallback(callback: Callback): BaseCallback;
+
+export { createWellknownError }
+
+export { CustomLogger }
+
+// @public
+export class DeviceProfileCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getMessage(): string;
+    isLocationRequired(): boolean;
+    isMetadataRequired(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setProfile(profile: DeviceProfileData): void;
+}
+
+// @public (undocumented)
+export interface DeviceProfileData {
+    // (undocumented)
+    identifier: string;
+    // (undocumented)
+    location?: Geolocation_2 | Record<string, unknown>;
+    // (undocumented)
+    metadata?: {
+        hardware: {
+            display: {
+                [key: string]: string | number | null;
+            };
+            [key: string]: any;
+        };
+        browser: {
+            [key: string]: string | number | null;
+        };
+        platform: {
+            [key: string]: string | number | null;
+        };
+    };
+}
+
+export { FailedPolicyRequirement }
+
+export { FailureDetail }
+
+export { GenericError }
+
+// @public (undocumented)
+interface Geolocation_2 {
+    // (undocumented)
+    latitude: number;
+    // (undocumented)
+    longitude: number;
+}
+export { Geolocation_2 as Geolocation }
+
+// @public
+export class HiddenValueCallback extends BaseCallback {
+    constructor(payload: Callback);
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public (undocumented)
+export interface IdPValue {
+    // (undocumented)
+    provider: string;
+    // (undocumented)
+    uiConfig: {
+        [key: string]: string;
+    };
+}
+
+// @internal
+export interface InternalJourneyClientConfig {
+    // (undocumented)
+    error?: GenericError;
+    // (undocumented)
+    serverConfig: ResolvedServerConfig;
+}
+
+export { isValidWellknownUrl }
+
+// @public
+export function journey<ActionType extends ActionTypes = ActionTypes>(input: {
+    config: JourneyClientConfig;
+    requestMiddleware?: RequestMiddleware<ActionType>[];
+    logger?: {
+        level: LogLevel;
+        custom?: CustomLogger;
+    };
+    store?: unknown;
+}): Promise<JourneyClient | {
+    error: string;
+    type: 'argument_error';
+}>;
+
+// @public
+export interface JourneyClient {
+    // (undocumented)
+    next: (step: JourneyStep, options?: NextOptions) => Promise<JourneyResult>;
+    // (undocumented)
+    redirect: (step: JourneyStep) => Promise<void>;
+    // (undocumented)
+    resume: (url: string, options?: ResumeOptions) => Promise<JourneyResult>;
+    // (undocumented)
+    start: (options?: StartParam) => Promise<JourneyResult>;
+    // (undocumented)
+    store: SdkStore;
+    // (undocumented)
+    subscribe: (listener: () => void) => () => void;
+    // (undocumented)
+    terminate: (options?: {
+        query?: Record<string, string>;
+    }) => Promise<void | GenericError>;
+}
+
+export { JourneyClientConfig }
+
+// @public (undocumented)
+export type JourneyLoginFailure = AuthResponse & {
+    type: StepType.LoginFailure;
+    payload: Step;
+    getCode: () => number;
+    getDetail: () => FailureDetail | undefined;
+    getMessage: () => string | undefined;
+    getProcessedMessage: (messageCreator?: MessageCreator) => ProcessedPropertyError[];
+    getReason: () => string | undefined;
+};
+
+// @public (undocumented)
+export type JourneyLoginSuccess = AuthResponse & {
+    type: StepType.LoginSuccess;
+    payload: Step;
+    getRealm: () => string | undefined;
+    getSessionToken: () => string | undefined;
+    getSuccessUrl: () => string | undefined;
+};
+
+// @public (undocumented)
+export type JourneyResult = JourneyStep | JourneyLoginSuccess | JourneyLoginFailure | GenericError;
+
+export { JourneyServerConfig }
+
+// @public (undocumented)
+export type JourneyStep = AuthResponse & {
+    type: StepType.Step;
+    payload: Step;
+    callbacks: BaseCallback[];
+    getCallbackOfType: <T extends BaseCallback>(type: CallbackType) => T;
+    getCallbacksOfType: <T extends BaseCallback>(type: CallbackType) => T[];
+    setCallbackValue: (type: CallbackType, value: unknown) => void;
+    getDescription: () => string | undefined;
+    getHeader: () => string | undefined;
+    getStage: () => string | undefined;
+};
+
+// @public
+export class KbaCreateCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getPredefinedQuestions(): string[];
+    getPrompt(): string;
+    isAllowedUserDefinedQuestions(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setAnswer(answer: string): void;
+    setQuestion(question: string): void;
+}
+
+export { LegacyServerConfig }
+
+export { LogLevel }
+
+export { makeJourneyConfig }
+
+// @public (undocumented)
+export interface MessageCreator {
+    // (undocumented)
+    [key: string]: (propertyName: string, params?: {
+        [key: string]: unknown;
+    }) => string;
+}
+
+// @public
+export class MetadataCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getData<T>(): T;
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public
+export class NameCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setName(name: string): void;
+}
+
+export { NameValue }
+
+// @public (undocumented)
+export interface NextOptions {
+    // (undocumented)
+    query?: Record<string, string>;
+}
+
+// @public
+export class PasswordCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getFailedPolicies(): PolicyRequirement[];
+    getPolicies(): string[];
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setPassword(password: string): void;
+}
+
+// @public
+export class PingOneProtectEvaluationCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getPauseBehavioralData(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setClientError(errorMessage: string): void;
+    setData(data: string): void;
+}
+
+// @public
+export class PingOneProtectInitializeCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getConfig(): Record<string, string> | {
+        envId: string;
+        consoleLogEnabled: boolean;
+        deviceAttributesToIgnore: string[];
+        customHost: string;
+        lazyMetadata: boolean;
+        behavioralDataCollection: boolean;
+        deviceKeyRsyncIntervals: number;
+        enableTrust: boolean;
+        disableTags: boolean;
+        disableHub: boolean;
+    };
+    // (undocumented)
+    payload: Callback;
+    // (undocumented)
+    setClientError(errorMessage: string): void;
+}
+
+export { PolicyKey }
+
+export { PolicyParams }
+
+export { PolicyRequirement }
+
+// @public
+export class PollingWaitCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getMessage(): string;
+    getWaitTime(): number;
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public (undocumented)
+export interface ProcessedPropertyError {
+    // (undocumented)
+    detail: FailedPolicyRequirement;
+    // (undocumented)
+    messages: string[];
+}
+
+// @public
+export class ReCaptchaCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getSiteKey(): string;
+    // (undocumented)
+    payload: Callback;
+    setResult(result: string): void;
+}
+
+// @public
+export class ReCaptchaEnterpriseCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getApiUrl(): string;
+    getElementClass(): string;
+    getSiteKey(): string;
+    // (undocumented)
+    payload: Callback;
+    setAction(action: string): void;
+    setClientError(error: string): void;
+    setPayload(payload: unknown): void;
+    setResult(result: string): void;
+}
+
+// @public
+export class RedirectCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getRedirectUrl(): string;
+    // (undocumented)
+    payload: Callback;
+}
+
+export { RequestMiddleware }
+
+// @public
+export interface ResolvedServerConfig {
+    // (undocumented)
+    baseUrl: string;
+    // (undocumented)
+    paths: {
+        authenticate: string;
+        sessions: string;
+    };
+}
+
+// @public (undocumented)
+export interface ResumeOptions {
+    // (undocumented)
+    journey?: string;
+    // (undocumented)
+    query?: Record<string, string>;
+}
+
+// @public
+export class SelectIdPCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getProviders(): IdPValue[];
+    // (undocumented)
+    payload: Callback;
+    setProvider(value: string): void;
+}
+
+// @public (undocumented)
+export interface StartParam {
+    // (undocumented)
+    journey: string;
+    // (undocumented)
+    query?: Record<string, string>;
+}
+
+export { Step }
+
+export { StepDetail }
+
+export { StepType }
+
+// @public
+export class SuspendedTextOutputCallback extends TextOutputCallback {
+    constructor(payload: Callback);
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public
+export class TermsAndConditionsCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getCreateDate(): Date | null;
+    getTerms(): string;
+    getVersion(): string;
+    // (undocumented)
+    payload: Callback;
+    setAccepted(accepted?: boolean): void;
+}
+
+// @public
+export class TextInputCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setInput(input: string): void;
+}
+
+// @public
+export class TextOutputCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getMessage(): string;
+    getMessageType(): string;
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public
+export class ValidatedCreatePasswordCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getFailedPolicies(): PolicyRequirement[];
+    getPolicies(): Record<string, any>;
+    getPrompt(): string;
+    isRequired(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setPassword(password: string): void;
+    setValidateOnly(value: boolean): void;
+}
+
+// @public
+export class ValidatedCreateUsernameCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getFailedPolicies(): PolicyRequirement[];
+    getPolicies(): Record<string, any>;
+    getPrompt(): string;
+    isRequired(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setName(name: string): void;
+    setValidateOnly(value: boolean): void;
+}
+
+export { WellknownResponse }
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/journey-client/api-report/journey-client.types.api.md b/packages/journey-client/api-report/journey-client.types.api.md
index 59ff118690a..f73b91af616 100644
--- a/packages/journey-client/api-report/journey-client.types.api.md
+++ b/packages/journey-client/api-report/journey-client.types.api.md
@@ -1,501 +1,493 @@
-## API Report File for "@forgerock/journey-client"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-import { ActionTypes } from '@forgerock/sdk-request-middleware';
-import { AuthResponse } from '@forgerock/sdk-types';
-import { Callback } from '@forgerock/sdk-types';
-import { CallbackType } from '@forgerock/sdk-types';
-import { createWellknownError } from '@forgerock/sdk-utilities';
-import { CustomLogger } from '@forgerock/sdk-logger';
-import { FailedPolicyRequirement } from '@forgerock/sdk-types';
-import { FailureDetail } from '@forgerock/sdk-types';
-import { GenericError } from '@forgerock/sdk-types';
-import { isValidWellknownUrl } from '@forgerock/sdk-utilities';
-import { JourneyClientConfig } from '@forgerock/sdk-types';
-import { JourneyServerConfig } from '@forgerock/sdk-types';
-import { LegacyServerConfig } from '@forgerock/sdk-types';
-import { LogLevel } from '@forgerock/sdk-logger';
-import { NameValue } from '@forgerock/sdk-types';
-import { PolicyKey } from '@forgerock/sdk-types';
-import { PolicyParams } from '@forgerock/sdk-types';
-import { PolicyRequirement } from '@forgerock/sdk-types';
-import { RequestMiddleware } from '@forgerock/sdk-request-middleware';
-import { Step } from '@forgerock/sdk-types';
-import { StepDetail } from '@forgerock/sdk-types';
-import { StepType } from '@forgerock/sdk-types';
-import { WellknownResponse } from '@forgerock/sdk-types';
-
-export { ActionTypes };
-
-// @public
-export class AttributeInputCallback<T extends string | number | boolean> extends BaseCallback {
-  constructor(payload: Callback);
-  getFailedPolicies(): PolicyRequirement[];
-  getName(): string;
-  getPolicies(): Record<string, unknown>;
-  getPrompt(): string;
-  isRequired(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setValidateOnly(value: boolean): void;
-  setValue(value: T): void;
-}
-
-export { AuthResponse };
-
-// @public
-export class BaseCallback {
-  constructor(payload: Callback);
-  getInputValue(selector?: number | string): unknown;
-  getOutputByName<T>(name: string, defaultValue: T): T;
-  getOutputValue(selector?: number | string): unknown;
-  getType(): CallbackType;
-  // (undocumented)
-  payload: Callback;
-  setInputValue(value: unknown, selector?: number | string | RegExp): void;
-}
-
-export { Callback };
-
-// @public (undocumented)
-export type CallbackFactory = (callback: Callback) => BaseCallback;
-
-export { CallbackType };
-
-// @public
-export class ChoiceCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getChoices(): string[];
-  getDefaultChoice(): number;
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setChoiceIndex(index: number): void;
-  setChoiceValue(value: string): void;
-}
-
-// @public
-export class ConfirmationCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getDefaultOption(): number;
-  getMessageType(): number;
-  getOptions(): string[];
-  getOptionType(): number;
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setOptionIndex(index: number): void;
-  setOptionValue(value: string): void;
-}
-
-// @public (undocumented)
-export function createCallback(callback: Callback): BaseCallback;
-
-export { createWellknownError };
-
-export { CustomLogger };
-
-// @public
-export class DeviceProfileCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getMessage(): string;
-  isLocationRequired(): boolean;
-  isMetadataRequired(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setProfile(profile: DeviceProfileData): void;
-}
-
-// @public (undocumented)
-export interface DeviceProfileData {
-  // (undocumented)
-  identifier: string;
-  // (undocumented)
-  location?: Geolocation_2 | Record<string, unknown>;
-  // (undocumented)
-  metadata?: {
-    hardware: {
-      display: {
-        [key: string]: string | number | null;
-      };
-      [key: string]: any;
-    };
-    browser: {
-      [key: string]: string | number | null;
-    };
-    platform: {
-      [key: string]: string | number | null;
-    };
-  };
-}
-
-export { FailedPolicyRequirement };
-
-export { FailureDetail };
-
-export { GenericError };
-
-// @public (undocumented)
-interface Geolocation_2 {
-  // (undocumented)
-  latitude: number;
-  // (undocumented)
-  longitude: number;
-}
-export { Geolocation_2 as Geolocation };
-
-// @public
-export class HiddenValueCallback extends BaseCallback {
-  constructor(payload: Callback);
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public (undocumented)
-export interface IdPValue {
-  // (undocumented)
-  provider: string;
-  // (undocumented)
-  uiConfig: {
-    [key: string]: string;
-  };
-}
-
-// @internal
-export interface InternalJourneyClientConfig {
-  // (undocumented)
-  error?: GenericError;
-  // (undocumented)
-  serverConfig: ResolvedServerConfig;
-}
-
-export { isValidWellknownUrl };
-
-// @public
-export function journey<ActionType extends ActionTypes = ActionTypes>(input: {
-  config: JourneyClientConfig;
-  requestMiddleware?: RequestMiddleware<ActionType>[];
-  logger?: {
-    level: LogLevel;
-    custom?: CustomLogger;
-  };
-}): Promise<JourneyClient>;
-
-// @public
-export interface JourneyClient {
-  // (undocumented)
-  next: (step: JourneyStep, options?: NextOptions) => Promise<JourneyResult>;
-  // (undocumented)
-  redirect: (step: JourneyStep) => Promise<void>;
-  // (undocumented)
-  resume: (url: string, options?: ResumeOptions) => Promise<JourneyResult>;
-  // (undocumented)
-  start: (options?: StartParam) => Promise<JourneyResult>;
-  // (undocumented)
-  subscribe: (listener: () => void) => () => void;
-  // (undocumented)
-  terminate: (options?: { query?: Record<string, string> }) => Promise<void | GenericError>;
-}
-
-export { JourneyClientConfig };
-
-// @public (undocumented)
-export type JourneyLoginFailure = AuthResponse & {
-  type: StepType.LoginFailure;
-  payload: Step;
-  getCode: () => number;
-  getDetail: () => FailureDetail | undefined;
-  getMessage: () => string | undefined;
-  getProcessedMessage: (messageCreator?: MessageCreator) => ProcessedPropertyError[];
-  getReason: () => string | undefined;
-};
-
-// @public (undocumented)
-export type JourneyLoginSuccess = AuthResponse & {
-  type: StepType.LoginSuccess;
-  payload: Step;
-  getRealm: () => string | undefined;
-  getSessionToken: () => string | undefined;
-  getSuccessUrl: () => string | undefined;
-};
-
-// @public (undocumented)
-export type JourneyResult = JourneyStep | JourneyLoginSuccess | JourneyLoginFailure | GenericError;
-
-export { JourneyServerConfig };
-
-// @public (undocumented)
-export type JourneyStep = AuthResponse & {
-  type: StepType.Step;
-  payload: Step;
-  callbacks: BaseCallback[];
-  getCallbackOfType: <T extends BaseCallback>(type: CallbackType) => T;
-  getCallbacksOfType: <T extends BaseCallback>(type: CallbackType) => T[];
-  setCallbackValue: (type: CallbackType, value: unknown) => void;
-  getDescription: () => string | undefined;
-  getHeader: () => string | undefined;
-  getStage: () => string | undefined;
-};
-
-// @public
-export class KbaCreateCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getPredefinedQuestions(): string[];
-  getPrompt(): string;
-  isAllowedUserDefinedQuestions(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setAnswer(answer: string): void;
-  setQuestion(question: string): void;
-}
-
-export { LegacyServerConfig };
-
-export { LogLevel };
-
-// @public (undocumented)
-export interface MessageCreator {
-  // (undocumented)
-  [key: string]: (
-    propertyName: string,
-    params?: {
-      [key: string]: unknown;
-    },
-  ) => string;
-}
-
-// @public
-export class MetadataCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getData<T>(): T;
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public
-export class NameCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setName(name: string): void;
-}
-
-export { NameValue };
-
-// @public (undocumented)
-export interface NextOptions {
-  // (undocumented)
-  query?: Record<string, string>;
-}
-
-// @public
-export class PasswordCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getFailedPolicies(): PolicyRequirement[];
-  getPolicies(): string[];
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setPassword(password: string): void;
-}
-
-// @public
-export class PingOneProtectEvaluationCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getPauseBehavioralData(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setClientError(errorMessage: string): void;
-  setData(data: string): void;
-}
-
-// @public
-export class PingOneProtectInitializeCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getConfig():
-    | Record<string, string>
-    | {
-        envId: string;
-        consoleLogEnabled: boolean;
-        deviceAttributesToIgnore: string[];
-        customHost: string;
-        lazyMetadata: boolean;
-        behavioralDataCollection: boolean;
-        deviceKeyRsyncIntervals: number;
-        enableTrust: boolean;
-        disableTags: boolean;
-        disableHub: boolean;
-      };
-  // (undocumented)
-  payload: Callback;
-  // (undocumented)
-  setClientError(errorMessage: string): void;
-}
-
-export { PolicyKey };
-
-export { PolicyParams };
-
-export { PolicyRequirement };
-
-// @public
-export class PollingWaitCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getMessage(): string;
-  getWaitTime(): number;
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public (undocumented)
-export interface ProcessedPropertyError {
-  // (undocumented)
-  detail: FailedPolicyRequirement;
-  // (undocumented)
-  messages: string[];
-}
-
-// @public
-export class ReCaptchaCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getSiteKey(): string;
-  // (undocumented)
-  payload: Callback;
-  setResult(result: string): void;
-}
-
-// @public
-export class ReCaptchaEnterpriseCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getApiUrl(): string;
-  getElementClass(): string;
-  getSiteKey(): string;
-  // (undocumented)
-  payload: Callback;
-  setAction(action: string): void;
-  setClientError(error: string): void;
-  setPayload(payload: unknown): void;
-  setResult(result: string): void;
-}
-
-// @public
-export class RedirectCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getRedirectUrl(): string;
-  // (undocumented)
-  payload: Callback;
-}
-
-export { RequestMiddleware };
-
-// @public
-export interface ResolvedServerConfig {
-  // (undocumented)
-  baseUrl: string;
-  // (undocumented)
-  paths: {
-    authenticate: string;
-    sessions: string;
-  };
-}
-
-// @public (undocumented)
-export interface ResumeOptions {
-  // (undocumented)
-  journey?: string;
-  // (undocumented)
-  query?: Record<string, string>;
-}
-
-// @public
-export class SelectIdPCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getProviders(): IdPValue[];
-  // (undocumented)
-  payload: Callback;
-  setProvider(value: string): void;
-}
-
-// @public (undocumented)
-export interface StartParam {
-  // (undocumented)
-  journey: string;
-  // (undocumented)
-  query?: Record<string, string>;
-}
-
-export { Step };
-
-export { StepDetail };
-
-export { StepType };
-
-// @public
-export class SuspendedTextOutputCallback extends TextOutputCallback {
-  constructor(payload: Callback);
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public
-export class TermsAndConditionsCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getCreateDate(): Date | null;
-  getTerms(): string;
-  getVersion(): string;
-  // (undocumented)
-  payload: Callback;
-  setAccepted(accepted?: boolean): void;
-}
-
-// @public
-export class TextInputCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getPrompt(): string;
-  // (undocumented)
-  payload: Callback;
-  setInput(input: string): void;
-}
-
-// @public
-export class TextOutputCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getMessage(): string;
-  getMessageType(): string;
-  // (undocumented)
-  payload: Callback;
-}
-
-// @public
-export class ValidatedCreatePasswordCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getFailedPolicies(): PolicyRequirement[];
-  getPolicies(): Record<string, any>;
-  getPrompt(): string;
-  isRequired(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setPassword(password: string): void;
-  setValidateOnly(value: boolean): void;
-}
-
-// @public
-export class ValidatedCreateUsernameCallback extends BaseCallback {
-  constructor(payload: Callback);
-  getFailedPolicies(): PolicyRequirement[];
-  getPolicies(): Record<string, any>;
-  getPrompt(): string;
-  isRequired(): boolean;
-  // (undocumented)
-  payload: Callback;
-  setName(name: string): void;
-  setValidateOnly(value: boolean): void;
-}
-
-export { WellknownResponse };
-
-// (No @packageDocumentation comment for this package)
-```
+## API Report File for "@forgerock/journey-client"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { ActionTypes } from '@forgerock/sdk-request-middleware';
+import { AuthResponse } from '@forgerock/sdk-types';
+import { Callback } from '@forgerock/sdk-types';
+import { CallbackType } from '@forgerock/sdk-types';
+import { createWellknownError } from '@forgerock/sdk-utilities';
+import { CustomLogger } from '@forgerock/sdk-logger';
+import { FailedPolicyRequirement } from '@forgerock/sdk-types';
+import { FailureDetail } from '@forgerock/sdk-types';
+import { GenericError } from '@forgerock/sdk-types';
+import { isValidWellknownUrl } from '@forgerock/sdk-utilities';
+import { JourneyClientConfig } from '@forgerock/sdk-types';
+import { JourneyServerConfig } from '@forgerock/sdk-types';
+import { LegacyServerConfig } from '@forgerock/sdk-types';
+import { LogLevel } from '@forgerock/sdk-logger';
+import { NameValue } from '@forgerock/sdk-types';
+import { PolicyKey } from '@forgerock/sdk-types';
+import { PolicyParams } from '@forgerock/sdk-types';
+import { PolicyRequirement } from '@forgerock/sdk-types';
+import { RequestMiddleware } from '@forgerock/sdk-request-middleware';
+import type { SdkStore } from '@forgerock/sdk-store';
+import { Step } from '@forgerock/sdk-types';
+import { StepDetail } from '@forgerock/sdk-types';
+import { StepType } from '@forgerock/sdk-types';
+import { WellknownResponse } from '@forgerock/sdk-types';
+
+export { ActionTypes }
+
+// @public
+export class AttributeInputCallback<T extends string | number | boolean> extends BaseCallback {
+    constructor(payload: Callback);
+    getFailedPolicies(): PolicyRequirement[];
+    getName(): string;
+    getPolicies(): Record<string, unknown>;
+    getPrompt(): string;
+    isRequired(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setValidateOnly(value: boolean): void;
+    setValue(value: T): void;
+}
+
+export { AuthResponse }
+
+// @public
+export class BaseCallback {
+    constructor(payload: Callback);
+    getInputValue(selector?: number | string): unknown;
+    getOutputByName<T>(name: string, defaultValue: T): T;
+    getOutputValue(selector?: number | string): unknown;
+    getType(): CallbackType;
+    // (undocumented)
+    payload: Callback;
+    setInputValue(value: unknown, selector?: number | string | RegExp): void;
+}
+
+export { Callback }
+
+// @public (undocumented)
+export type CallbackFactory = (callback: Callback) => BaseCallback;
+
+export { CallbackType }
+
+// @public
+export class ChoiceCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getChoices(): string[];
+    getDefaultChoice(): number;
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setChoiceIndex(index: number): void;
+    setChoiceValue(value: string): void;
+}
+
+// @public
+export class ConfirmationCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getDefaultOption(): number;
+    getMessageType(): number;
+    getOptions(): string[];
+    getOptionType(): number;
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setOptionIndex(index: number): void;
+    setOptionValue(value: string): void;
+}
+
+// @public (undocumented)
+export function createCallback(callback: Callback): BaseCallback;
+
+export { createWellknownError }
+
+export { CustomLogger }
+
+// @public
+export class DeviceProfileCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getMessage(): string;
+    isLocationRequired(): boolean;
+    isMetadataRequired(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setProfile(profile: DeviceProfileData): void;
+}
+
+// @public (undocumented)
+export interface DeviceProfileData {
+    // (undocumented)
+    identifier: string;
+    // (undocumented)
+    location?: Geolocation_2 | Record<string, unknown>;
+    // (undocumented)
+    metadata?: {
+        hardware: {
+            display: {
+                [key: string]: string | number | null;
+            };
+            [key: string]: any;
+        };
+        browser: {
+            [key: string]: string | number | null;
+        };
+        platform: {
+            [key: string]: string | number | null;
+        };
+    };
+}
+
+export { FailedPolicyRequirement }
+
+export { FailureDetail }
+
+export { GenericError }
+
+// @public (undocumented)
+interface Geolocation_2 {
+    // (undocumented)
+    latitude: number;
+    // (undocumented)
+    longitude: number;
+}
+export { Geolocation_2 as Geolocation }
+
+// @public
+export class HiddenValueCallback extends BaseCallback {
+    constructor(payload: Callback);
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public (undocumented)
+export interface IdPValue {
+    // (undocumented)
+    provider: string;
+    // (undocumented)
+    uiConfig: {
+        [key: string]: string;
+    };
+}
+
+// @internal
+export interface InternalJourneyClientConfig {
+    // (undocumented)
+    error?: GenericError;
+    // (undocumented)
+    serverConfig: ResolvedServerConfig;
+}
+
+export { isValidWellknownUrl }
+
+// @public
+export interface JourneyClient {
+    // (undocumented)
+    next: (step: JourneyStep, options?: NextOptions) => Promise<JourneyResult>;
+    // (undocumented)
+    redirect: (step: JourneyStep) => Promise<void>;
+    // (undocumented)
+    resume: (url: string, options?: ResumeOptions) => Promise<JourneyResult>;
+    // (undocumented)
+    start: (options?: StartParam) => Promise<JourneyResult>;
+    // (undocumented)
+    store: SdkStore;
+    // (undocumented)
+    subscribe: (listener: () => void) => () => void;
+    // (undocumented)
+    terminate: (options?: {
+        query?: Record<string, string>;
+    }) => Promise<void | GenericError>;
+}
+
+export { JourneyClientConfig }
+
+// @public (undocumented)
+export type JourneyLoginFailure = AuthResponse & {
+    type: StepType.LoginFailure;
+    payload: Step;
+    getCode: () => number;
+    getDetail: () => FailureDetail | undefined;
+    getMessage: () => string | undefined;
+    getProcessedMessage: (messageCreator?: MessageCreator) => ProcessedPropertyError[];
+    getReason: () => string | undefined;
+};
+
+// @public (undocumented)
+export type JourneyLoginSuccess = AuthResponse & {
+    type: StepType.LoginSuccess;
+    payload: Step;
+    getRealm: () => string | undefined;
+    getSessionToken: () => string | undefined;
+    getSuccessUrl: () => string | undefined;
+};
+
+// @public (undocumented)
+export type JourneyResult = JourneyStep | JourneyLoginSuccess | JourneyLoginFailure | GenericError;
+
+export { JourneyServerConfig }
+
+// @public (undocumented)
+export type JourneyStep = AuthResponse & {
+    type: StepType.Step;
+    payload: Step;
+    callbacks: BaseCallback[];
+    getCallbackOfType: <T extends BaseCallback>(type: CallbackType) => T;
+    getCallbacksOfType: <T extends BaseCallback>(type: CallbackType) => T[];
+    setCallbackValue: (type: CallbackType, value: unknown) => void;
+    getDescription: () => string | undefined;
+    getHeader: () => string | undefined;
+    getStage: () => string | undefined;
+};
+
+// @public
+export class KbaCreateCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getPredefinedQuestions(): string[];
+    getPrompt(): string;
+    isAllowedUserDefinedQuestions(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setAnswer(answer: string): void;
+    setQuestion(question: string): void;
+}
+
+export { LegacyServerConfig }
+
+export { LogLevel }
+
+// @public (undocumented)
+export interface MessageCreator {
+    // (undocumented)
+    [key: string]: (propertyName: string, params?: {
+        [key: string]: unknown;
+    }) => string;
+}
+
+// @public
+export class MetadataCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getData<T>(): T;
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public
+export class NameCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setName(name: string): void;
+}
+
+export { NameValue }
+
+// @public (undocumented)
+export interface NextOptions {
+    // (undocumented)
+    query?: Record<string, string>;
+}
+
+// @public
+export class PasswordCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getFailedPolicies(): PolicyRequirement[];
+    getPolicies(): string[];
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setPassword(password: string): void;
+}
+
+// @public
+export class PingOneProtectEvaluationCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getPauseBehavioralData(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setClientError(errorMessage: string): void;
+    setData(data: string): void;
+}
+
+// @public
+export class PingOneProtectInitializeCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getConfig(): Record<string, string> | {
+        envId: string;
+        consoleLogEnabled: boolean;
+        deviceAttributesToIgnore: string[];
+        customHost: string;
+        lazyMetadata: boolean;
+        behavioralDataCollection: boolean;
+        deviceKeyRsyncIntervals: number;
+        enableTrust: boolean;
+        disableTags: boolean;
+        disableHub: boolean;
+    };
+    // (undocumented)
+    payload: Callback;
+    // (undocumented)
+    setClientError(errorMessage: string): void;
+}
+
+export { PolicyKey }
+
+export { PolicyParams }
+
+export { PolicyRequirement }
+
+// @public
+export class PollingWaitCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getMessage(): string;
+    getWaitTime(): number;
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public (undocumented)
+export interface ProcessedPropertyError {
+    // (undocumented)
+    detail: FailedPolicyRequirement;
+    // (undocumented)
+    messages: string[];
+}
+
+// @public
+export class ReCaptchaCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getSiteKey(): string;
+    // (undocumented)
+    payload: Callback;
+    setResult(result: string): void;
+}
+
+// @public
+export class ReCaptchaEnterpriseCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getApiUrl(): string;
+    getElementClass(): string;
+    getSiteKey(): string;
+    // (undocumented)
+    payload: Callback;
+    setAction(action: string): void;
+    setClientError(error: string): void;
+    setPayload(payload: unknown): void;
+    setResult(result: string): void;
+}
+
+// @public
+export class RedirectCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getRedirectUrl(): string;
+    // (undocumented)
+    payload: Callback;
+}
+
+export { RequestMiddleware }
+
+// @public
+export interface ResolvedServerConfig {
+    // (undocumented)
+    baseUrl: string;
+    // (undocumented)
+    paths: {
+        authenticate: string;
+        sessions: string;
+    };
+}
+
+// @public (undocumented)
+export interface ResumeOptions {
+    // (undocumented)
+    journey?: string;
+    // (undocumented)
+    query?: Record<string, string>;
+}
+
+// @public
+export class SelectIdPCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getProviders(): IdPValue[];
+    // (undocumented)
+    payload: Callback;
+    setProvider(value: string): void;
+}
+
+// @public (undocumented)
+export interface StartParam {
+    // (undocumented)
+    journey: string;
+    // (undocumented)
+    query?: Record<string, string>;
+}
+
+export { Step }
+
+export { StepDetail }
+
+export { StepType }
+
+// @public
+export class SuspendedTextOutputCallback extends TextOutputCallback {
+    constructor(payload: Callback);
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public
+export class TermsAndConditionsCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getCreateDate(): Date | null;
+    getTerms(): string;
+    getVersion(): string;
+    // (undocumented)
+    payload: Callback;
+    setAccepted(accepted?: boolean): void;
+}
+
+// @public
+export class TextInputCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getPrompt(): string;
+    // (undocumented)
+    payload: Callback;
+    setInput(input: string): void;
+}
+
+// @public
+export class TextOutputCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getMessage(): string;
+    getMessageType(): string;
+    // (undocumented)
+    payload: Callback;
+}
+
+// @public
+export class ValidatedCreatePasswordCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getFailedPolicies(): PolicyRequirement[];
+    getPolicies(): Record<string, any>;
+    getPrompt(): string;
+    isRequired(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setPassword(password: string): void;
+    setValidateOnly(value: boolean): void;
+}
+
+// @public
+export class ValidatedCreateUsernameCallback extends BaseCallback {
+    constructor(payload: Callback);
+    getFailedPolicies(): PolicyRequirement[];
+    getPolicies(): Record<string, any>;
+    getPrompt(): string;
+    isRequired(): boolean;
+    // (undocumented)
+    payload: Callback;
+    setName(name: string): void;
+    setValidateOnly(value: boolean): void;
+}
+
+export { WellknownResponse }
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/journey-client/package.json b/packages/journey-client/package.json
index 38a1039d63c..badecc0352a 100644
--- a/packages/journey-client/package.json
+++ b/packages/journey-client/package.json
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@forgerock/sdk-logger": "workspace:*",
-    "@forgerock/sdk-oidc": "workspace:*",
     "@forgerock/sdk-request-middleware": "workspace:*",
+    "@forgerock/sdk-store": "workspace:*",
     "@forgerock/sdk-types": "workspace:*",
     "@forgerock/sdk-utilities": "workspace:*",
     "@forgerock/storage": "workspace:*",
diff --git a/packages/journey-client/src/lib/client.store.test.ts b/packages/journey-client/src/lib/client.store.test.ts
index 9f2f3de96da..f063e9447b9 100644
--- a/packages/journey-client/src/lib/client.store.test.ts
+++ b/packages/journey-client/src/lib/client.store.test.ts
@@ -8,7 +8,7 @@
 
 import { afterEach, describe, expect, test, vi } from 'vitest';
 
-import { journey } from './client.store.js';
+import { journey, type JourneyClient } from './client.store.js';
 import { makeJourneyConfig } from '@forgerock/sdk-utilities';
 import { createJourneyStep } from './step.utils.js';
 
@@ -108,7 +108,7 @@ describe('journey-client', () => {
   test('journey_WellknownConfig_ReturnsClientWithAllMethods', async () => {
     setupMockFetch();
 
-    const client = await journey({ config: mockConfig });
+    const client = (await journey({ config: mockConfig })) as JourneyClient;
 
     expect(client.start).toBeInstanceOf(Function);
     expect(client.next).toBeInstanceOf(Function);
@@ -142,7 +142,7 @@ describe('journey-client', () => {
     const mockStepResponse: Step = { authId: 'test-auth-id', callbacks: [] };
     setupMockFetch(mockStepResponse);
 
-    const client = await journey({ config: mockConfig });
+    const client = (await journey({ config: mockConfig })) as JourneyClient;
     const step = await client.start();
 
     expect(step).toBeDefined();
@@ -169,7 +169,7 @@ describe('journey-client', () => {
     };
     setupMockFetch(failurePayload, 401);
 
-    const client = await journey({ config: mockConfig });
+    const client = (await journey({ config: mockConfig })) as JourneyClient;
     const result = await client.start();
 
     expect(result).toBeDefined();
@@ -207,7 +207,7 @@ describe('journey-client', () => {
     };
     setupMockFetch(nextStepPayload);
 
-    const client = await journey({ config: mockConfig });
+    const client = (await journey({ config: mockConfig })) as JourneyClient;
     const nextStep = await client.next(initialStep, {});
 
     expect(nextStep).toBeDefined();
@@ -237,7 +237,7 @@ describe('journey-client', () => {
     };
     setupMockFetch(failurePayload, 401);
 
-    const client = await journey({ config: mockConfig });
+    const client = (await journey({ config: mockConfig })) as JourneyClient;
     const result = await client.next(initialStep, {});
 
     expect(result).toBeDefined();
@@ -267,7 +267,7 @@ describe('journey-client', () => {
     vi.stubGlobal('window', { location: { assign: assignMock } });
     setupMockFetch();
 
-    const client = await journey({ config: mockConfig });
+    const client = (await journey({ config: mockConfig })) as JourneyClient;
     await client.redirect(step);
 
     expect(mockStorageInstance.set).toHaveBeenCalledWith({ step: step.payload });
@@ -285,7 +285,7 @@ describe('journey-client', () => {
       const nextStepPayload: Step = { authId: 'test-auth-id', callbacks: [] };
       setupMockFetch(nextStepPayload);
 
-      const client = await journey({ config: mockConfig });
+      const client = (await journey({ config: mockConfig })) as JourneyClient;
       const resumeUrl = 'https://app.com/callback?code=123&state=abc';
       const step = await client.resume(resumeUrl, {});
 
@@ -314,7 +314,7 @@ describe('journey-client', () => {
       const nextStepPayload: Step = { authId: 'test-auth-id', callbacks: [] };
       setupMockFetch(nextStepPayload);
 
-      const client = await journey({ config: mockConfig });
+      const client = (await journey({ config: mockConfig })) as JourneyClient;
       const resumeUrl =
         'https://app.com/callback?code=123&state=abc&error=access_denied&errorCode=E1&errorMessage=oops&form_post_entry=fp&nonce=n1&RelayState=rs&responsekey=rk&scope=openid&suspendedId=s1';
       await client.resume(resumeUrl, {});
@@ -342,7 +342,7 @@ describe('journey-client', () => {
       const nextStepPayload: Step = { authId: 'test-auth-id', callbacks: [] };
       setupMockFetch(nextStepPayload);
 
-      const client = await journey({ config: mockConfig });
+      const client = (await journey({ config: mockConfig })) as JourneyClient;
       const resumeUrl = 'https://app.com/callback?code=123&state=abc';
       await client.resume(resumeUrl, { query: { code: 'override' } });
 
@@ -363,7 +363,7 @@ describe('journey-client', () => {
       const nextStepPayload: Step = { authId: 'test-auth-id', callbacks: [] };
       setupMockFetch(nextStepPayload);
 
-      const client = await journey({ config: mockConfig });
+      const client = (await journey({ config: mockConfig })) as JourneyClient;
       const resumeUrl = 'https://app.com/callback?code=123&state=abc';
       const step = await client.resume(resumeUrl, {});
 
@@ -384,7 +384,7 @@ describe('journey-client', () => {
       mockStorageInstance.get.mockResolvedValue(undefined);
       setupMockFetch();
 
-      const client = await journey({ config: mockConfig });
+      const client = (await journey({ config: mockConfig })) as JourneyClient;
       const resumeUrl = 'https://app.com/callback?code=123&state=abc';
 
       await expect(client.resume(resumeUrl)).rejects.toThrow(
@@ -399,7 +399,7 @@ describe('journey-client', () => {
       const mockStepResponse: Step = { authId: 'test-auth-id', callbacks: [] };
       setupMockFetch(mockStepResponse);
 
-      const client = await journey({ config: mockConfig });
+      const client = (await journey({ config: mockConfig })) as JourneyClient;
       const resumeUrl = 'https://app.com/callback?foo=bar';
       const step = await client.resume(resumeUrl, {});
 
@@ -419,7 +419,7 @@ describe('journey-client', () => {
   test('start_NoDataFromServer_ReturnsGenericError', async () => {
     setupMockFetch(null);
 
-    const client = await journey({ config: mockConfig });
+    const client = (await journey({ config: mockConfig })) as JourneyClient;
     const result = await client.start();
 
     expect(isGenericError(result)).toBe(true);
@@ -453,7 +453,7 @@ describe('journey-client', () => {
         return Promise.resolve(new Response(JSON.stringify(mockStepResponse)));
       });
 
-      const client = await journey({ config: localhostConfig });
+      const client = (await journey({ config: localhostConfig })) as JourneyClient;
       await client.start();
 
       expect(mockFetch).toHaveBeenCalledTimes(2);
@@ -553,7 +553,7 @@ describe('journey-client', () => {
         return Promise.resolve(new Response(JSON.stringify(mockStepResponse)));
       });
 
-      const client = await journey({ config: alphaConfig });
+      const client = (await journey({ config: alphaConfig })) as JourneyClient;
       await client.start();
 
       const request = mockFetch.mock.calls[1][0] as Request;
@@ -581,9 +581,9 @@ describe('journey-client', () => {
     test('journey_BaseUrl_NoRealmPath_UsesRootAuthenticate', async () => {
       setupBaseUrlFetch();
 
-      const client = await journey({
+      const client = (await journey({
         config: { serverConfig: { baseUrl } },
-      });
+      })) as JourneyClient;
       await client.start();
 
       expect(mockFetch).toHaveBeenCalledTimes(1);
@@ -594,9 +594,9 @@ describe('journey-client', () => {
     test('journey_BaseUrl_WithRealmPath_UsesRealmAuthenticate', async () => {
       setupBaseUrlFetch();
 
-      const client = await journey({
+      const client = (await journey({
         config: { serverConfig: { baseUrl }, realmPath: 'alpha' },
-      });
+      })) as JourneyClient;
       await client.start();
 
       expect(mockFetch).toHaveBeenCalledTimes(1);
@@ -609,9 +609,9 @@ describe('journey-client', () => {
     test('journey_BaseUrl_TrailingSlashInput_NormalizesCorrectly', async () => {
       setupBaseUrlFetch();
 
-      const client = await journey({
+      const client = (await journey({
         config: { serverConfig: { baseUrl: `${baseUrl}/` } },
-      });
+      })) as JourneyClient;
       await client.start();
 
       const request = mockFetch.mock.calls[0][0] as Request;
@@ -621,9 +621,9 @@ describe('journey-client', () => {
     test('journey_BaseUrl_Terminate_UsesRootSessionsUrl', async () => {
       setupBaseUrlFetch();
 
-      const client = await journey({
+      const client = (await journey({
         config: { serverConfig: { baseUrl } },
-      });
+      })) as JourneyClient;
       await client.terminate();
 
       expect(mockFetch).toHaveBeenCalledTimes(1);
@@ -636,9 +636,9 @@ describe('journey-client', () => {
     test('journey_BaseUrl_WithRealmPath_Terminate_UsesRealmSessionsUrl', async () => {
       setupBaseUrlFetch();
 
-      const client = await journey({
+      const client = (await journey({
         config: { serverConfig: { baseUrl }, realmPath: 'alpha' },
-      });
+      })) as JourneyClient;
       await client.terminate();
 
       expect(mockFetch).toHaveBeenCalledTimes(1);
diff --git a/packages/journey-client/src/lib/client.store.ts b/packages/journey-client/src/lib/client.store.ts
index 5ea9604ed66..84276819d5d 100644
--- a/packages/journey-client/src/lib/client.store.ts
+++ b/packages/journey-client/src/lib/client.store.ts
@@ -14,6 +14,7 @@ import {
   getEndpointPath,
 } from '@forgerock/sdk-utilities';
 import type { GenericError } from '@forgerock/sdk-types';
+import type { SdkStore } from '@forgerock/sdk-store';
 import type { ActionTypes, RequestMiddleware } from '@forgerock/sdk-request-middleware';
 import type { Step } from '@forgerock/sdk-types';
 
@@ -24,7 +25,7 @@ import { createStorage } from '@forgerock/storage';
 import * as Either from 'effect/Either';
 import { createJourneyObject, parseJourneyResponse } from './journey.utils.js';
 import type { JourneyResult } from './journey.utils.js';
-import { wellknownApi } from './wellknown.api.js';
+import { wellknownApi, assertValidStore, getClientForReducerPath } from '@forgerock/sdk-store';
 
 import type { JourneyStep } from './step.utils.js';
 import type { JourneyClientConfig } from './config.types.js';
@@ -33,6 +34,7 @@ import type { NextOptions, StartParam, ResumeOptions } from './interfaces.js';
 
 /** The journey client instance returned by the `journey()` function. */
 export interface JourneyClient {
+  store: SdkStore;
   subscribe: (listener: () => void) => () => void;
   start: (options?: StartParam) => Promise<JourneyResult>;
   next: (step: JourneyStep, options?: NextOptions) => Promise<JourneyResult>;
@@ -74,6 +76,7 @@ export async function journey<ActionType extends ActionTypes = ActionTypes>({
   config,
   requestMiddleware,
   logger,
+  store: sharedStore,
 }: {
   config: JourneyClientConfig;
   requestMiddleware?: RequestMiddleware<ActionType>[];
@@ -81,7 +84,12 @@ export async function journey<ActionType extends ActionTypes = ActionTypes>({
     level: LogLevel;
     custom?: CustomLogger;
   };
-}): Promise<JourneyClient> {
+  /**
+   * An existing SDK store to attach to, so discovery caching and state are
+   * shared with another client. Omit to create a store for this client alone.
+   */
+  store?: unknown;
+}): Promise<JourneyClient | { error: string; type: 'argument_error' }> {
   const log = loggerFn({
     level: logger?.level ?? config.log ?? 'error',
     custom: logger?.custom,
@@ -113,7 +121,24 @@ export async function journey<ActionType extends ActionTypes = ActionTypes>({
     );
   }
 
-  const store = createJourneyStore({ requestMiddleware, logger: log });
+  const storeError = assertValidStore(sharedStore);
+  if (storeError) return storeError;
+
+  const validStore = sharedStore as SdkStore | undefined;
+
+  if (validStore) {
+    const existing = getClientForReducerPath(validStore, journeyApi.reducerPath);
+    if (existing) {
+      return {
+        error:
+          'This store already has a journey client attached. Use a separate store per journey client.',
+        type: 'argument_error' as const,
+      };
+    }
+  }
+
+  const handle = createJourneyStore({ requestMiddleware, logger: log, store: validStore });
+  const store = handle.store;
 
   if ('baseUrl' in config.serverConfig) {
     const { baseUrl } = config.serverConfig;
@@ -180,6 +205,7 @@ export async function journey<ActionType extends ActionTypes = ActionTypes>({
   });
 
   const self: JourneyClient = {
+    store: handle as SdkStore,
     subscribe: store.subscribe,
 
     start: async (options?: StartParam) => {
diff --git a/packages/journey-client/src/lib/client.store.utils.ts b/packages/journey-client/src/lib/client.store.utils.ts
index 7c08201f872..c9a939caec9 100644
--- a/packages/journey-client/src/lib/client.store.utils.ts
+++ b/packages/journey-client/src/lib/client.store.utils.ts
@@ -7,40 +7,47 @@
 
 import { logger as loggerFn } from '@forgerock/sdk-logger';
 import { ActionTypes, RequestMiddleware } from '@forgerock/sdk-request-middleware';
-import { combineReducers, configureStore } from '@reduxjs/toolkit';
+
+import { combineSlices } from '@reduxjs/toolkit';
 
 import { configSlice } from './config.slice.js';
 import { journeyApi } from './journey.api.js';
-import { wellknownApi } from './wellknown.api.js';
+import { createSdkStore, injectClient, wellknownApi } from '@forgerock/sdk-store';
+
+import type { SdkStore, SdkStoreHandle } from '@forgerock/sdk-store';
+
+/**
+ * The canonical description of the state this client contributes.
+ *
+ * The runtime store is assembled by `injectClient`, which TypeScript cannot
+ * follow across lazy injection. Combining the same slices here lets the state
+ * type be *derived* from them rather than hand-written, so it cannot drift from
+ * what is actually mounted. Exported so the derived state type resolves for
+ * consumers, and so an application can compose the reducer itself if it wants.
+ */
+export const rootReducer = combineSlices(journeyApi, configSlice, wellknownApi);
 
-const rootReducer = combineReducers({
-  [journeyApi.reducerPath]: journeyApi.reducer,
-  [configSlice.name]: configSlice.reducer,
-  [wellknownApi.reducerPath]: wellknownApi.reducer,
-});
+export type RootState = ReturnType<typeof rootReducer>;
 
+/**
+ * Creates, or attaches to, the store backing a Journey client.
+ *
+ * Passing `store` attaches to an existing SDK store so that discovery caching
+ * and state are shared; omitting it creates one, which is the default.
+ */
 export const createJourneyStore = <ActionType extends ActionTypes>({
   requestMiddleware,
   logger,
+  store,
 }: {
   requestMiddleware?: RequestMiddleware<ActionType, unknown>[];
   logger?: ReturnType<typeof loggerFn>;
-}) => {
-  return configureStore({
-    reducer: rootReducer,
-    middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware({
-        serializableCheck: true,
-        thunk: {
-          extraArgument: {
-            requestMiddleware,
-            logger,
-          },
-        },
-      })
-        .concat(journeyApi.middleware)
-        .concat(wellknownApi.middleware),
+  store?: SdkStore;
+}): SdkStoreHandle<RootState> =>
+  injectClient<RootState>(store ?? createSdkStore(), {
+    api: journeyApi,
+    reducerPath: journeyApi.reducerPath,
+    slices: [configSlice],
+    requestMiddleware,
+    logger,
   });
-};
-
-export type RootState = ReturnType<typeof rootReducer>;
diff --git a/packages/journey-client/src/lib/journey.api.ts b/packages/journey-client/src/lib/journey.api.ts
index 66c4da9a299..e503df99403 100644
--- a/packages/journey-client/src/lib/journey.api.ts
+++ b/packages/journey-client/src/lib/journey.api.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 - 2025 Ping Identity Corporation. All rights reserved.
+ * Copyright (c) 2020 - 2026 Ping Identity Corporation. All rights reserved.
  *
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
@@ -10,7 +10,8 @@ import { REQUESTED_WITH, getEndpointPath, stringify, resolve } from '@forgerock/
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query';
 
 import type { Step } from '@forgerock/sdk-types';
-import type { logger as loggerFn } from '@forgerock/sdk-logger';
+import { logger as loggerFn } from '@forgerock/sdk-logger';
+import { clientExtra } from '@forgerock/sdk-store';
 import type {
   BaseQueryApi,
   BaseQueryFn,
@@ -84,13 +85,37 @@ function configureSessionRequest(): RequestInit {
   return init;
 }
 
+const JOURNEY_REDUCER_PATH = 'journeyReducer';
+
+/**
+ * This client's private slot on the store's `extraArgument`.
+ *
+ * Optional because a shared store may not have had a journey slot registered
+ * yet; `journeyExtra` substitutes safe defaults.
+ */
 interface Extras {
-  requestMiddleware: RequestMiddleware[];
-  logger: ReturnType<typeof loggerFn>;
+  requestMiddleware?: RequestMiddleware[];
+  logger?: ReturnType<typeof loggerFn>;
+}
+
+/** Fallback so a missing slot degrades to error-level logging, never a crash. */
+const fallbackLogger = loggerFn({ level: 'error' });
+
+/**
+ * Resolves this client's own middleware and logger.
+ *
+ * Reads only the `journeyReducer` slot — never a store-wide value, which on a
+ * shared store would belong to whichever client created it.
+ */
+function journeyExtra(extra: unknown): Required<Extras> {
+  return clientExtra(extra, JOURNEY_REDUCER_PATH, {
+    requestMiddleware: [],
+    logger: fallbackLogger,
+  });
 }
 
 export const journeyApi = createApi({
-  reducerPath: 'journeyReducer',
+  reducerPath: JOURNEY_REDUCER_PATH,
   baseQuery: fetchBaseQuery({
     baseUrl: '/',
     prepareHeaders: (headers: Headers) => {
@@ -121,7 +146,7 @@ export const journeyApi = createApi({
         const url = constructUrl(serverConfig, options?.journey, query);
         const request = configureRequest();
 
-        const { requestMiddleware } = api.extra as Extras;
+        const { requestMiddleware } = journeyExtra(api.extra);
 
         const response = await initQuery({ ...request, url: url }, 'begin', {
           type: 'service',
@@ -153,7 +178,7 @@ export const journeyApi = createApi({
         const url = constructUrl(serverConfig, undefined, query);
         const request = configureRequest(step);
 
-        const { requestMiddleware } = api.extra as Extras;
+        const { requestMiddleware } = journeyExtra(api.extra);
 
         const response = await initQuery({ ...request, url }, 'continue')
           .applyMiddleware(requestMiddleware)
@@ -183,7 +208,7 @@ export const journeyApi = createApi({
         const url = constructSessionsUrl(serverConfig, query);
         const request = configureSessionRequest();
 
-        const { requestMiddleware } = api.extra as Extras;
+        const { requestMiddleware } = journeyExtra(api.extra);
 
         const response = await initQuery({ ...request, url }, 'terminate')
           .applyMiddleware(requestMiddleware)
diff --git a/packages/journey-client/src/lib/store-shape.test.ts b/packages/journey-client/src/lib/store-shape.test.ts
new file mode 100644
index 00000000000..d2ea5926676
--- /dev/null
+++ b/packages/journey-client/src/lib/store-shape.test.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { describe, expect, it } from 'vitest';
+
+import { createJourneyStore } from './client.store.utils.js';
+
+/**
+ * `combineSlices` keys each reducer off `slice.reducerPath ?? slice.name`, where
+ * the previous `combineReducers({ ... })` form spelled the keys out literally.
+ * That makes the published state shape an implicit consequence of slice
+ * metadata: renaming `configSlice.name` would silently reshape the store.
+ *
+ * These assertions pin the shape so such a rename fails loudly here instead of
+ * in a consumer's selectors.
+ */
+describe('journey store shape', () => {
+  it('exposes exactly the expected top-level state keys', () => {
+    // Arrange
+    const { store } = createJourneyStore({});
+
+    // Act
+    const keys = Object.keys(store.getState()).sort();
+
+    // Assert
+    expect(keys).toEqual(['config', 'journeyReducer', 'wellknown']);
+  });
+
+  it('registers this client\u2019s slot on the store extra, keyed by reducerPath', async () => {
+    // Arrange
+    const { store } = createJourneyStore({});
+    let observed: unknown;
+
+    // Act — a thunk is the supported way to observe extraArgument
+    await store.dispatch(((_dispatch: unknown, _getState: unknown, extra: unknown) => {
+      observed = extra;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    }) as any);
+
+    // Assert
+    expect(observed).toHaveProperty('clients.journeyReducer');
+  });
+});
diff --git a/packages/journey-client/src/lib/wellknown.api.ts b/packages/journey-client/src/lib/wellknown.api.ts
index d8f2dde9367..b0d550e183a 100644
--- a/packages/journey-client/src/lib/wellknown.api.ts
+++ b/packages/journey-client/src/lib/wellknown.api.ts
@@ -6,7 +6,7 @@
  */
 
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query';
-import { initWellknownQuery } from '@forgerock/sdk-oidc';
+import { initWellknownQuery } from '@forgerock/sdk-store';
 
 import type { WellknownResponse } from '@forgerock/sdk-types';
 import type {
@@ -18,7 +18,7 @@ import type {
 /**
  * RTK Query API for well-known endpoint discovery.
  *
- * Uses the `initWellknownQuery` builder pattern from `@forgerock/sdk-oidc`.
+ * Uses the `initWellknownQuery` builder pattern from `@forgerock/sdk-store`.
  * The builder constructs the request and validates the response;
  * `fetchBaseQuery` handles the HTTP transport through RTK Query's pipeline.
  */
diff --git a/packages/journey-client/tsconfig.lib.json b/packages/journey-client/tsconfig.lib.json
index ca3f899b8dc..573c9f707ea 100644
--- a/packages/journey-client/tsconfig.lib.json
+++ b/packages/journey-client/tsconfig.lib.json
@@ -28,10 +28,10 @@
       "path": "../sdk-types/tsconfig.lib.json"
     },
     {
-      "path": "../sdk-effects/sdk-request-middleware/tsconfig.lib.json"
+      "path": "../sdk-effects/store/tsconfig.lib.json"
     },
     {
-      "path": "../sdk-effects/oidc/tsconfig.lib.json"
+      "path": "../sdk-effects/sdk-request-middleware/tsconfig.lib.json"
     },
     {
       "path": "../sdk-effects/logger/tsconfig.lib.json"
diff --git a/packages/oidc-client/README.md b/packages/oidc-client/README.md
index 4119d84729e..27bea7eb711 100644
--- a/packages/oidc-client/README.md
+++ b/packages/oidc-client/README.md
@@ -10,6 +10,7 @@ The oidc module follows the [OIDC](https://openid.net/specs/openid-connect-core-
 - [Initialization](#initialization)
   - [Configuration Options](#configuration-options)
 - [Quick Start](#quick-start)
+- [Sharing a Store With Another Client](#sharing-a-store-with-another-client)
 - [API Reference](#api-reference)
   - [authorize](#authorize)
   - [token](#token)
@@ -54,11 +55,17 @@ The `oidc()` initialization function accepts the following configuration:
   - **wellknown** (required) - URL to the OIDC provider's well-known configuration endpoint
 - **clientId** (required) - Your application's client ID registered with the OIDC provider
 - **redirectUri** (required) - The URI where the OIDC provider will redirect after authentication
-- **scope** (required) - Space-separated list of requested scopes (e.g., `'openid profile email'`)
+- **scope** (optional, default: `'openid'`) - Space-separated list of requested scopes (e.g., `'openid profile email'`)
 - **storage** (optional) - Storage configuration for tokens (defaults to localStorage)
 - **timeout** (optional) - Request timeout in milliseconds
 - **additionalParameters** (optional) - Additional parameters to include in authorization requests
 
+The `oidc()` function also accepts:
+
+- **requestMiddleware** (optional) - Middleware applied to this client's requests only
+- **logger** (optional) - Log level and custom logger for this client only
+- **store** (optional) - An existing SDK store to attach to. See [Sharing a Store](#sharing-a-store-with-another-client)
+
 ## Quick Start
 
 Here's a minimal example to get started:
@@ -82,6 +89,65 @@ const user = await oidcClient.user.info();
 await oidcClient.user.logout();
 ```
 
+## Sharing a Store With Another Client
+
+If your application also uses `@forgerock/davinci-client` or `@forgerock/journey-client`, the clients can share one Redux store. The well-known discovery document is then fetched once rather than once per client.
+
+Pass the other client's `store` handle:
+
+```js
+import { davinci } from '@forgerock/davinci-client';
+import { oidc } from '@forgerock/oidc-client';
+
+const davinciClient = await davinci({ config: davinciConfig });
+
+// Attaches to davinci's store; the discovery document is already cached there.
+const oidcClient = await oidc({ config: oidcConfig, store: davinciClient.store });
+```
+
+Or create the store yourself when neither client is the natural owner:
+
+```js
+import { createSdkStore } from '@forgerock/sdk-store';
+
+const store = createSdkStore();
+const davinciClient = await davinci({ config: davinciConfig, store });
+const oidcClient = await oidc({ config: oidcConfig, store });
+```
+
+Omitting `store` is always valid — the client creates its own, which is the default behaviour.
+
+### Middleware and logging stay private
+
+Sharing a store shares cached data, not configuration. Your `requestMiddleware` and `logger` are registered against this client alone and are only applied to OIDC requests:
+
+```js
+const oidcClient = await oidc({
+  config,
+  store,
+  // Runs for AUTHORIZE, PAR, TOKEN_EXCHANGE, REVOKE, USER_INFO and END_SESSION only.
+  requestMiddleware: [myOidcMiddleware],
+  logger: { level: 'debug' },
+});
+```
+
+Middleware passed to `davinci()` or `journey()` will never run against an OIDC token exchange, and middleware passed here will never run against their requests.
+
+### One OIDC client per store
+
+`oidc()` mounts at a fixed key in the store, so two OIDC clients sharing one store would overwrite each other's token state. Initialising a second client with a different `clientId` returns an `argument_error`:
+
+```js
+const store = createSdkStore();
+await oidc({ config: { ...config, clientId: 'app-one' }, store });
+
+const second = await oidc({ config: { ...config, clientId: 'app-two' }, store });
+// { error: "This store is already in use by an OIDC client with clientId 'app-one'. ...",
+//   type: 'argument_error' }
+```
+
+Re-initialising with the _same_ `clientId` is allowed and idempotent. If you need two clientIds, give each its own store.
+
 ## API Reference
 
 ### authorize
@@ -326,7 +392,7 @@ const tokens = await oidcClient.token.get({
 if ('error' in tokens) {
   console.error('Failed to retrieve tokens:', tokens.error);
 } else {
-  console.log('Access token:', tokens.access_token);
+  console.log('Access token:', tokens.accessToken);
 }
 ```
 
diff --git a/packages/oidc-client/api-report/oidc-client.api.md b/packages/oidc-client/api-report/oidc-client.api.md
index bcdce96e278..51e35326f5a 100644
--- a/packages/oidc-client/api-report/oidc-client.api.md
+++ b/packages/oidc-client/api-report/oidc-client.api.md
@@ -6,9 +6,9 @@
 
 import { ActionTypes } from '@forgerock/sdk-request-middleware';
 import { BaseQueryFn } from '@reduxjs/toolkit/query';
+import { CombinedSliceReducer } from '@reduxjs/toolkit';
 import { CombinedState } from '@reduxjs/toolkit/query';
 import { CustomLogger } from '@forgerock/sdk-logger';
-import { EnhancedStore } from '@reduxjs/toolkit';
 import { FetchArgs } from '@reduxjs/toolkit/query';
 import type { FetchBaseQueryError } from '@reduxjs/toolkit/query';
 import { FetchBaseQueryMeta } from '@reduxjs/toolkit/query';
@@ -17,18 +17,15 @@ import { GetAuthorizationUrlOptions } from '@forgerock/sdk-types';
 import type { JWTPayload } from 'jose';
 import { logger } from '@forgerock/sdk-logger';
 import { LogLevel } from '@forgerock/sdk-logger';
-import { LogMessage } from '@forgerock/sdk-logger';
 import { makeOidcConfig } from '@forgerock/sdk-utilities';
 import { MutationDefinition } from '@reduxjs/toolkit/query';
 import { OidcConfig } from '@forgerock/sdk-types';
 import { QueryDefinition } from '@reduxjs/toolkit/query';
 import { RequestMiddleware } from '@forgerock/sdk-request-middleware';
 import { ResponseType as ResponseType_2 } from '@forgerock/sdk-types';
+import type { SdkStore } from '@forgerock/sdk-store';
+import type { SdkStoreHandle } from '@forgerock/sdk-store';
 import { StorageConfig } from '@forgerock/storage';
-import { StoreEnhancer } from '@reduxjs/toolkit';
-import { ThunkDispatch } from '@reduxjs/toolkit';
-import { Tuple } from '@reduxjs/toolkit';
-import { UnknownAction } from '@reduxjs/toolkit';
 import { Unsubscribe } from '@reduxjs/toolkit';
 import { WellknownResponse } from '@forgerock/sdk-types';
 
@@ -114,119 +111,16 @@ export interface AuthorizeSuccessResponse {
 // @public (undocumented)
 export type BuildAuthorizationData = [string, GetAuthorizationUrlOptions];
 
-// @public (undocumented)
-export type ClientStore = ReturnType<typeof createClientStore>;
+// @public
+export type ClientStore = ReturnType<typeof createClientStore>['store'];
 
 // @public
 export function createClientStore<ActionType extends ActionTypes>(input: {
     requestMiddleware?: RequestMiddleware<ActionType, unknown>[];
     logger?: ReturnType<typeof logger>;
-}): EnhancedStore<    {
-oidc: CombinedState<    {
-authorizeFetch: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
-par: MutationDefinition<    {
-endpoint: string;
-body: URLSearchParams;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
-sessionCheckIframe: MutationDefinition<    {
-url: string;
-responseType: SessionCheckResponseType;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
-params: Record<string, string>;
-}, "oidc", unknown>;
-sessionCheckFetch: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
-status: 204;
-}, "oidc", unknown>;
-authorizeIframe: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
-endSession: MutationDefinition<    {
-idToken: string;
-endpoint: string;
-signOutRedirectUri?: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
-exchange: MutationDefinition<    {
-code: string;
-config: OidcConfig;
-endpoint: string;
-verifier?: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
-revoke: MutationDefinition<    {
-accessToken: string;
-clientId?: string;
-endpoint: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
-userInfo: MutationDefinition<    {
-accessToken: string;
-endpoint: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
-}, never, "oidc">;
-wellknown: CombinedState<    {
-configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
-}, never, "wellknown">;
-}, UnknownAction, Tuple<[StoreEnhancer<    {
-dispatch: ThunkDispatch<    {
-oidc: CombinedState<    {
-authorizeFetch: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
-par: MutationDefinition<    {
-endpoint: string;
-body: URLSearchParams;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
-sessionCheckIframe: MutationDefinition<    {
-url: string;
-responseType: SessionCheckResponseType;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
-params: Record<string, string>;
-}, "oidc", unknown>;
-sessionCheckFetch: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
-status: 204;
-}, "oidc", unknown>;
-authorizeIframe: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
-endSession: MutationDefinition<    {
-idToken: string;
-endpoint: string;
-signOutRedirectUri?: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
-exchange: MutationDefinition<    {
-code: string;
-config: OidcConfig;
-endpoint: string;
-verifier?: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
-revoke: MutationDefinition<    {
-accessToken: string;
-clientId?: string;
-endpoint: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
-userInfo: MutationDefinition<    {
-accessToken: string;
-endpoint: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
-}, never, "oidc">;
-wellknown: CombinedState<    {
-configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
-}, never, "wellknown">;
-}, {
-requestMiddleware: RequestMiddleware<ActionType, unknown>[] | undefined;
-logger: {
-changeLevel: (level: LogLevel) => void;
-error: (...args: LogMessage[]) => void;
-warn: (...args: LogMessage[]) => void;
-info: (...args: LogMessage[]) => void;
-debug: (...args: LogMessage[]) => void;
-} | undefined;
-}, UnknownAction>;
-}>, StoreEnhancer]>>;
+    store?: SdkStore;
+    clientId?: string;
+}): SdkStoreHandle<OidcRootState>;
 
 export { CustomLogger }
 
@@ -278,22 +172,16 @@ export interface OauthTokens {
 }
 
 // @public
-export function oidc<ActionType extends ActionTypes = ActionTypes>(input: {
-    config: OidcConfig;
-    requestMiddleware?: RequestMiddleware<ActionType>[];
-    logger?: {
-        level: LogLevel;
-        custom?: CustomLogger;
-    };
-    storage?: Partial<StorageConfig>;
-}): Promise<{
+export function oidc<ActionType extends ActionTypes = ActionTypes>(raw: RawOidcArgs<ActionType>): Promise<GenericError | {
     error: string;
     type: string;
+    store?: undefined;
     subscribe?: undefined;
     authorize?: undefined;
     token?: undefined;
     user?: undefined;
 } | {
+    store: SdkStore;
     subscribe: (listener: () => void) => Unsubscribe;
     authorize: {
         url: (options?: GetAuthorizationUrlOptions) => Promise<string | GenericError>;
@@ -318,6 +206,9 @@ export type OidcClient = Awaited<ReturnType<typeof oidc>>;
 
 export { OidcConfig }
 
+// @public (undocumented)
+export type OidcRootState = ReturnType<typeof rootReducer>;
+
 // @public (undocumented)
 export type OptionalAuthorizeOptions = Partial<GetAuthorizationUrlOptions>;
 
@@ -329,6 +220,18 @@ export interface PushAuthorizationResponse {
     request_uri: string;
 }
 
+// @public
+export type RawOidcArgs<ActionType extends ActionTypes = ActionTypes> = {
+    config: OidcConfig;
+    requestMiddleware?: RequestMiddleware<ActionType>[];
+    logger?: {
+        level: LogLevel;
+        custom?: CustomLogger;
+    };
+    storage?: Partial<StorageConfig>;
+    store?: unknown;
+};
+
 export { RequestMiddleware }
 
 export { ResponseType_2 as ResponseType }
@@ -346,6 +249,150 @@ export type RevokeSuccessResult = {
     deleteResponse: null;
 };
 
+// @public
+export const rootReducer: CombinedSliceReducer<    {
+oidc: CombinedState<    {
+authorizeFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
+par: MutationDefinition<    {
+endpoint: string;
+body: URLSearchParams;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
+sessionCheckIframe: MutationDefinition<    {
+url: string;
+responseType: SessionCheckResponseType;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+params: Record<string, string>;
+}, "oidc", unknown>;
+sessionCheckFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+status: 204;
+}, "oidc", unknown>;
+authorizeIframe: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
+endSession: MutationDefinition<    {
+idToken: string;
+endpoint: string;
+signOutRedirectUri?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
+exchange: MutationDefinition<    {
+code: string;
+config: OidcConfig;
+endpoint: string;
+verifier?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
+revoke: MutationDefinition<    {
+accessToken: string;
+clientId?: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
+userInfo: MutationDefinition<    {
+accessToken: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
+}, never, "oidc">;
+wellknown: CombinedState<    {
+configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
+}, never, "wellknown">;
+}, {
+oidc: CombinedState<    {
+authorizeFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
+par: MutationDefinition<    {
+endpoint: string;
+body: URLSearchParams;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
+sessionCheckIframe: MutationDefinition<    {
+url: string;
+responseType: SessionCheckResponseType;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+params: Record<string, string>;
+}, "oidc", unknown>;
+sessionCheckFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+status: 204;
+}, "oidc", unknown>;
+authorizeIframe: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
+endSession: MutationDefinition<    {
+idToken: string;
+endpoint: string;
+signOutRedirectUri?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
+exchange: MutationDefinition<    {
+code: string;
+config: OidcConfig;
+endpoint: string;
+verifier?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
+revoke: MutationDefinition<    {
+accessToken: string;
+clientId?: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
+userInfo: MutationDefinition<    {
+accessToken: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
+}, never, "oidc">;
+wellknown: CombinedState<    {
+configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
+}, never, "wellknown">;
+}, Partial<{
+oidc: CombinedState<    {
+authorizeFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
+par: MutationDefinition<    {
+endpoint: string;
+body: URLSearchParams;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
+sessionCheckIframe: MutationDefinition<    {
+url: string;
+responseType: SessionCheckResponseType;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+params: Record<string, string>;
+}, "oidc", unknown>;
+sessionCheckFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+status: 204;
+}, "oidc", unknown>;
+authorizeIframe: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
+endSession: MutationDefinition<    {
+idToken: string;
+endpoint: string;
+signOutRedirectUri?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
+exchange: MutationDefinition<    {
+code: string;
+config: OidcConfig;
+endpoint: string;
+verifier?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
+revoke: MutationDefinition<    {
+accessToken: string;
+clientId?: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
+userInfo: MutationDefinition<    {
+accessToken: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
+}, never, "oidc">;
+wellknown: CombinedState<    {
+configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
+}, never, "wellknown">;
+}>>;
+
 // @public (undocumented)
 export type RootState = ReturnType<ClientStore['getState']>;
 
diff --git a/packages/oidc-client/api-report/oidc-client.types.api.md b/packages/oidc-client/api-report/oidc-client.types.api.md
index 02a90f352a5..4d282f83a14 100644
--- a/packages/oidc-client/api-report/oidc-client.types.api.md
+++ b/packages/oidc-client/api-report/oidc-client.types.api.md
@@ -6,9 +6,9 @@
 
 import { ActionTypes } from '@forgerock/sdk-request-middleware';
 import { BaseQueryFn } from '@reduxjs/toolkit/query';
+import { CombinedSliceReducer } from '@reduxjs/toolkit';
 import { CombinedState } from '@reduxjs/toolkit/query';
 import { CustomLogger } from '@forgerock/sdk-logger';
-import { EnhancedStore } from '@reduxjs/toolkit';
 import { FetchArgs } from '@reduxjs/toolkit/query';
 import type { FetchBaseQueryError } from '@reduxjs/toolkit/query';
 import { FetchBaseQueryMeta } from '@reduxjs/toolkit/query';
@@ -17,17 +17,14 @@ import { GetAuthorizationUrlOptions } from '@forgerock/sdk-types';
 import type { JWTPayload } from 'jose';
 import { logger } from '@forgerock/sdk-logger';
 import { LogLevel } from '@forgerock/sdk-logger';
-import { LogMessage } from '@forgerock/sdk-logger';
 import { MutationDefinition } from '@reduxjs/toolkit/query';
 import { OidcConfig } from '@forgerock/sdk-types';
 import { QueryDefinition } from '@reduxjs/toolkit/query';
 import { RequestMiddleware } from '@forgerock/sdk-request-middleware';
 import { ResponseType as ResponseType_2 } from '@forgerock/sdk-types';
+import type { SdkStore } from '@forgerock/sdk-store';
+import type { SdkStoreHandle } from '@forgerock/sdk-store';
 import { StorageConfig } from '@forgerock/storage';
-import { StoreEnhancer } from '@reduxjs/toolkit';
-import { ThunkDispatch } from '@reduxjs/toolkit';
-import { Tuple } from '@reduxjs/toolkit';
-import { UnknownAction } from '@reduxjs/toolkit';
 import { Unsubscribe } from '@reduxjs/toolkit';
 import { WellknownResponse } from '@forgerock/sdk-types';
 
@@ -113,119 +110,16 @@ export interface AuthorizeSuccessResponse {
 // @public (undocumented)
 export type BuildAuthorizationData = [string, GetAuthorizationUrlOptions];
 
-// @public (undocumented)
-export type ClientStore = ReturnType<typeof createClientStore>;
+// @public
+export type ClientStore = ReturnType<typeof createClientStore>['store'];
 
 // @public
 export function createClientStore<ActionType extends ActionTypes>(input: {
     requestMiddleware?: RequestMiddleware<ActionType, unknown>[];
     logger?: ReturnType<typeof logger>;
-}): EnhancedStore<    {
-oidc: CombinedState<    {
-authorizeFetch: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
-par: MutationDefinition<    {
-endpoint: string;
-body: URLSearchParams;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
-sessionCheckIframe: MutationDefinition<    {
-url: string;
-responseType: SessionCheckResponseType;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
-params: Record<string, string>;
-}, "oidc", unknown>;
-sessionCheckFetch: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
-status: 204;
-}, "oidc", unknown>;
-authorizeIframe: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
-endSession: MutationDefinition<    {
-idToken: string;
-endpoint: string;
-signOutRedirectUri?: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
-exchange: MutationDefinition<    {
-code: string;
-config: OidcConfig;
-endpoint: string;
-verifier?: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
-revoke: MutationDefinition<    {
-accessToken: string;
-clientId?: string;
-endpoint: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
-userInfo: MutationDefinition<    {
-accessToken: string;
-endpoint: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
-}, never, "oidc">;
-wellknown: CombinedState<    {
-configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
-}, never, "wellknown">;
-}, UnknownAction, Tuple<[StoreEnhancer<    {
-dispatch: ThunkDispatch<    {
-oidc: CombinedState<    {
-authorizeFetch: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
-par: MutationDefinition<    {
-endpoint: string;
-body: URLSearchParams;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
-sessionCheckIframe: MutationDefinition<    {
-url: string;
-responseType: SessionCheckResponseType;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
-params: Record<string, string>;
-}, "oidc", unknown>;
-sessionCheckFetch: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
-status: 204;
-}, "oidc", unknown>;
-authorizeIframe: MutationDefinition<    {
-url: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
-endSession: MutationDefinition<    {
-idToken: string;
-endpoint: string;
-signOutRedirectUri?: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
-exchange: MutationDefinition<    {
-code: string;
-config: OidcConfig;
-endpoint: string;
-verifier?: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
-revoke: MutationDefinition<    {
-accessToken: string;
-clientId?: string;
-endpoint: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
-userInfo: MutationDefinition<    {
-accessToken: string;
-endpoint: string;
-}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
-}, never, "oidc">;
-wellknown: CombinedState<    {
-configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
-}, never, "wellknown">;
-}, {
-requestMiddleware: RequestMiddleware<ActionType, unknown>[] | undefined;
-logger: {
-changeLevel: (level: LogLevel) => void;
-error: (...args: LogMessage[]) => void;
-warn: (...args: LogMessage[]) => void;
-info: (...args: LogMessage[]) => void;
-debug: (...args: LogMessage[]) => void;
-} | undefined;
-}, UnknownAction>;
-}>, StoreEnhancer]>>;
+    store?: SdkStore;
+    clientId?: string;
+}): SdkStoreHandle<OidcRootState>;
 
 export { CustomLogger }
 
@@ -275,22 +169,16 @@ export interface OauthTokens {
 }
 
 // @public
-export function oidc<ActionType extends ActionTypes = ActionTypes>(input: {
-    config: OidcConfig;
-    requestMiddleware?: RequestMiddleware<ActionType>[];
-    logger?: {
-        level: LogLevel;
-        custom?: CustomLogger;
-    };
-    storage?: Partial<StorageConfig>;
-}): Promise<{
+export function oidc<ActionType extends ActionTypes = ActionTypes>(raw: RawOidcArgs<ActionType>): Promise<GenericError | {
     error: string;
     type: string;
+    store?: undefined;
     subscribe?: undefined;
     authorize?: undefined;
     token?: undefined;
     user?: undefined;
 } | {
+    store: SdkStore;
     subscribe: (listener: () => void) => Unsubscribe;
     authorize: {
         url: (options?: GetAuthorizationUrlOptions) => Promise<string | GenericError>;
@@ -315,6 +203,9 @@ export type OidcClient = Awaited<ReturnType<typeof oidc>>;
 
 export { OidcConfig }
 
+// @public (undocumented)
+export type OidcRootState = ReturnType<typeof rootReducer>;
+
 // @public (undocumented)
 export type OptionalAuthorizeOptions = Partial<GetAuthorizationUrlOptions>;
 
@@ -326,6 +217,18 @@ export interface PushAuthorizationResponse {
     request_uri: string;
 }
 
+// @public
+export type RawOidcArgs<ActionType extends ActionTypes = ActionTypes> = {
+    config: OidcConfig;
+    requestMiddleware?: RequestMiddleware<ActionType>[];
+    logger?: {
+        level: LogLevel;
+        custom?: CustomLogger;
+    };
+    storage?: Partial<StorageConfig>;
+    store?: unknown;
+};
+
 export { RequestMiddleware }
 
 export { ResponseType_2 as ResponseType }
@@ -343,6 +246,150 @@ export type RevokeSuccessResult = {
     deleteResponse: null;
 };
 
+// @public
+export const rootReducer: CombinedSliceReducer<    {
+oidc: CombinedState<    {
+authorizeFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
+par: MutationDefinition<    {
+endpoint: string;
+body: URLSearchParams;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
+sessionCheckIframe: MutationDefinition<    {
+url: string;
+responseType: SessionCheckResponseType;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+params: Record<string, string>;
+}, "oidc", unknown>;
+sessionCheckFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+status: 204;
+}, "oidc", unknown>;
+authorizeIframe: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
+endSession: MutationDefinition<    {
+idToken: string;
+endpoint: string;
+signOutRedirectUri?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
+exchange: MutationDefinition<    {
+code: string;
+config: OidcConfig;
+endpoint: string;
+verifier?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
+revoke: MutationDefinition<    {
+accessToken: string;
+clientId?: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
+userInfo: MutationDefinition<    {
+accessToken: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
+}, never, "oidc">;
+wellknown: CombinedState<    {
+configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
+}, never, "wellknown">;
+}, {
+oidc: CombinedState<    {
+authorizeFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
+par: MutationDefinition<    {
+endpoint: string;
+body: URLSearchParams;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
+sessionCheckIframe: MutationDefinition<    {
+url: string;
+responseType: SessionCheckResponseType;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+params: Record<string, string>;
+}, "oidc", unknown>;
+sessionCheckFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+status: 204;
+}, "oidc", unknown>;
+authorizeIframe: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
+endSession: MutationDefinition<    {
+idToken: string;
+endpoint: string;
+signOutRedirectUri?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
+exchange: MutationDefinition<    {
+code: string;
+config: OidcConfig;
+endpoint: string;
+verifier?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
+revoke: MutationDefinition<    {
+accessToken: string;
+clientId?: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
+userInfo: MutationDefinition<    {
+accessToken: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
+}, never, "oidc">;
+wellknown: CombinedState<    {
+configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
+}, never, "wellknown">;
+}, Partial<{
+oidc: CombinedState<    {
+authorizeFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizeSuccessResponse, "oidc", unknown>;
+par: MutationDefinition<    {
+endpoint: string;
+body: URLSearchParams;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, PushAuthorizationResponse, "oidc", unknown>;
+sessionCheckIframe: MutationDefinition<    {
+url: string;
+responseType: SessionCheckResponseType;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+params: Record<string, string>;
+}, "oidc", unknown>;
+sessionCheckFetch: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, {
+status: 204;
+}, "oidc", unknown>;
+authorizeIframe: MutationDefinition<    {
+url: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, AuthorizationSuccess, "oidc", unknown>;
+endSession: MutationDefinition<    {
+idToken: string;
+endpoint: string;
+signOutRedirectUri?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, null, "oidc", unknown>;
+exchange: MutationDefinition<    {
+code: string;
+config: OidcConfig;
+endpoint: string;
+verifier?: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, TokenExchangeResponse, "oidc", unknown>;
+revoke: MutationDefinition<    {
+accessToken: string;
+clientId?: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, object, "oidc", unknown>;
+userInfo: MutationDefinition<    {
+accessToken: string;
+endpoint: string;
+}, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, UserInfoResponse, "oidc", unknown>;
+}, never, "oidc">;
+wellknown: CombinedState<    {
+configuration: QueryDefinition<string, BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError, {}, FetchBaseQueryMeta>, never, WellknownResponse, "wellknown", unknown>;
+}, never, "wellknown">;
+}>>;
+
 // @public (undocumented)
 export type RootState = ReturnType<ClientStore['getState']>;
 
diff --git a/packages/oidc-client/package.json b/packages/oidc-client/package.json
index a7dcbfdc8ca..5d9fce002e8 100644
--- a/packages/oidc-client/package.json
+++ b/packages/oidc-client/package.json
@@ -31,6 +31,7 @@
     "@forgerock/sdk-logger": "workspace:*",
     "@forgerock/sdk-oidc": "workspace:*",
     "@forgerock/sdk-request-middleware": "workspace:*",
+    "@forgerock/sdk-store": "workspace:*",
     "@forgerock/sdk-types": "workspace:*",
     "@forgerock/sdk-utilities": "workspace:*",
     "@forgerock/storage": "workspace:*",
diff --git a/packages/oidc-client/src/lib/client-extra.test.ts b/packages/oidc-client/src/lib/client-extra.test.ts
new file mode 100644
index 00000000000..8101b69076b
--- /dev/null
+++ b/packages/oidc-client/src/lib/client-extra.test.ts
@@ -0,0 +1,192 @@
+// @vitest-environment node
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { configureStore } from '@reduxjs/toolkit';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { wellknownApi } from '@forgerock/sdk-store';
+import { oidcApi } from './oidc.api.js';
+
+import type { RequestMiddleware } from '@forgerock/sdk-request-middleware';
+
+/**
+ * Regression coverage for the shared-store middleware leak.
+ *
+ * OIDC endpoints resolve their middleware and logger from the store's thunk
+ * `extraArgument`. When a store is shared with davinci/journey, that `extra`
+ * belongs to the owning client — so before the per-client registry, DaVinci
+ * middleware executed against TOKEN_EXCHANGE, REVOKE, END_SESSION and friends,
+ * and oidc's own logger was silently discarded.
+ *
+ * These tests build a store whose `extra` carries slots for two clients and
+ * assert that oidc endpoints only ever see their own.
+ */
+
+const REVOKE_URL = 'https://example.pingone.com/test-env/as/revoke';
+
+function recordingMiddleware(calls: string[], label: string): RequestMiddleware {
+  return (_req, action, next) => {
+    calls.push(`${label}:${action.type}`);
+    next();
+  };
+}
+
+function makeLoggerSpy() {
+  return {
+    debug: vi.fn(),
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+  };
+}
+
+/** A store shaped like a shared SDK store: one `extra`, one slot per client. */
+function makeTwoClientStore(slots: Record<string, unknown>) {
+  return configureStore({
+    reducer: {
+      [oidcApi.reducerPath]: oidcApi.reducer,
+      [wellknownApi.reducerPath]: wellknownApi.reducer,
+    },
+    middleware: (getDefaultMiddleware) =>
+      getDefaultMiddleware({ thunk: { extraArgument: { clients: slots } } })
+        .concat(wellknownApi.middleware)
+        .concat(oidcApi.middleware),
+  });
+}
+
+describe('oidc endpoints resolve middleware and logger per client', () => {
+  beforeEach(() => {
+    vi.spyOn(globalThis, 'fetch').mockImplementation(
+      async () =>
+        new Response(JSON.stringify({ access_token: 'at', token_type: 'Bearer' }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        }),
+    );
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+    oidcApi.util.resetApiState();
+  });
+
+  it('does not run another client\u2019s requestMiddleware against an OIDC request', async () => {
+    // Arrange
+    const calls: string[] = [];
+    const store = makeTwoClientStore({
+      davinci: {
+        requestMiddleware: [recordingMiddleware(calls, 'davinci')],
+        logger: makeLoggerSpy(),
+      },
+      oidc: { requestMiddleware: [], logger: makeLoggerSpy() },
+    });
+
+    // Act
+    await store.dispatch(
+      oidcApi.endpoints.revoke.initiate({
+        accessToken: 'test-access-token',
+        clientId: 'test-client-id',
+        endpoint: REVOKE_URL,
+      }),
+    );
+
+    // Assert — before the per-client registry this recorded 'davinci:TOKEN_EXCHANGE'
+    expect(calls).toEqual([]);
+  });
+
+  it("runs the OIDC client's own requestMiddleware against an OIDC request", async () => {
+    // Arrange
+    const calls: string[] = [];
+    const store = makeTwoClientStore({
+      davinci: { requestMiddleware: [recordingMiddleware(calls, 'davinci')] },
+      oidc: {
+        requestMiddleware: [recordingMiddleware(calls, 'oidc')],
+        logger: makeLoggerSpy(),
+      },
+    });
+
+    // Act
+    await store.dispatch(
+      oidcApi.endpoints.revoke.initiate({
+        accessToken: 'test-access-token',
+        clientId: 'test-client-id',
+        endpoint: REVOKE_URL,
+      }),
+    );
+
+    // Assert
+    expect(calls.filter((c) => c.startsWith('oidc:'))).not.toHaveLength(0);
+    expect(calls.filter((c) => c.startsWith('davinci:'))).toHaveLength(0);
+  });
+
+  it('ignores a store-wide flat middleware list (the original leak shape)', async () => {
+    // Arrange — this is exactly what davinci/journey used to put in extraArgument.
+    // If oidc ever reads the whole `extra` again instead of its own slot, this fails.
+    const calls: string[] = [];
+    const store = configureStore({
+      reducer: {
+        [oidcApi.reducerPath]: oidcApi.reducer,
+        [wellknownApi.reducerPath]: wellknownApi.reducer,
+      },
+      middleware: (getDefaultMiddleware) =>
+        getDefaultMiddleware({
+          thunk: {
+            extraArgument: {
+              requestMiddleware: [recordingMiddleware(calls, 'store-wide')],
+              logger: makeLoggerSpy(),
+            },
+          },
+        })
+          .concat(wellknownApi.middleware)
+          .concat(oidcApi.middleware),
+    });
+
+    // Act
+    await store.dispatch(
+      oidcApi.endpoints.revoke.initiate({
+        accessToken: 'test-access-token',
+        clientId: 'test-client-id',
+        endpoint: REVOKE_URL,
+      }),
+    );
+
+    // Assert
+    expect(calls).toEqual([]);
+  });
+
+  it("uses the OIDC client's own logger, not the owning client's", async () => {
+    // Arrange
+    const oidcLogger = makeLoggerSpy();
+    const davinciLogger = makeLoggerSpy();
+    const store = makeTwoClientStore({
+      davinci: { requestMiddleware: [], logger: davinciLogger },
+      oidc: { requestMiddleware: [], logger: oidcLogger },
+    });
+
+    // Act
+    await store.dispatch(
+      oidcApi.endpoints.revoke.initiate({
+        accessToken: 'test-access-token',
+        clientId: 'test-client-id',
+        endpoint: REVOKE_URL,
+      }),
+    );
+
+    // Assert
+    const oidcCalls =
+      oidcLogger.debug.mock.calls.length +
+      oidcLogger.info.mock.calls.length +
+      oidcLogger.error.mock.calls.length;
+    const davinciCalls =
+      davinciLogger.debug.mock.calls.length +
+      davinciLogger.info.mock.calls.length +
+      davinciLogger.error.mock.calls.length;
+
+    expect(oidcCalls).toBeGreaterThan(0);
+    expect(davinciCalls).toBe(0);
+  });
+});
diff --git a/packages/oidc-client/src/lib/client.store.ts b/packages/oidc-client/src/lib/client.store.ts
index dbd80e42216..d53db5d083d 100644
--- a/packages/oidc-client/src/lib/client.store.ts
+++ b/packages/oidc-client/src/lib/client.store.ts
@@ -12,17 +12,17 @@ import { causeIsDie, exitIsFail, exitIsSuccess } from 'effect/Micro';
 
 import { authorizeµ, createParAuthorizeUrlµ } from './authorize.request.js';
 import { buildTokenExchangeµ } from './exchange.request.js';
-import { createClientStore, createTokenError } from './client.store.utils.js';
+import { createClientStore, createTokenError, parseOidcArgs } from './client.store.utils.js';
 import { handleMicroExit } from '@forgerock/sdk-utilities';
 import { isExpiryWithinThreshold } from './token.utils.js';
 import { logoutµ } from './logout.request.js';
 import { oidcApi } from './oidc.api.js';
 import { sessionCheckNoneµ, sessionCheckIdTokenµ } from './session.micros.js';
-import { wellknownApi, wellknownSelector } from './wellknown.api.js';
+import { wellknownApi, wellknownSelector } from '@forgerock/sdk-store';
 
-import type { ActionTypes, RequestMiddleware } from '@forgerock/sdk-request-middleware';
+import type { ActionTypes } from '@forgerock/sdk-request-middleware';
 import type { GenericError, GetAuthorizationUrlOptions } from '@forgerock/sdk-types';
-import type { CustomLogger, LogLevel } from '@forgerock/sdk-logger';
+import type { SdkStore } from '@forgerock/sdk-store';
 import type { StorageConfig } from '@forgerock/storage';
 
 import type {
@@ -33,63 +33,53 @@ import type {
   RevokeSuccessResult,
   UserInfoResponse,
 } from './client.types.js';
-import type { OauthTokens, OidcConfig } from './config.types.js';
+import type { OauthTokens } from './config.types.js';
 import type { AuthorizationError, AuthorizationSuccess } from './authorize.request.types.js';
 import type { TokenExchangeErrorResponse } from './exchange.types.js';
 import type { SessionCheckOptions, SessionCheckSuccess } from './session.types.js';
+import type { RawOidcArgs } from './client.store.types.js';
 
 /**
  * @function oidc
  * @description Factory function to create an OIDC client with methods for authorization, token exchange,
  *              user info retrieval, and logout. It initializes the client with the provided configuration,
  *              request middleware, logger, and storage options.
- * @param param - configuration object containing the OIDC client configuration, request middleware, logger,
- * @param {OidcConfig} param.config - OIDC configuration including server details, client ID, redirect URI,
+ * @param raw - configuration object containing the OIDC client configuration, request middleware, logger,
+ * @param {OidcConfig} raw.config - OIDC configuration including server details, client ID, redirect URI,
  *              storage options, scope, and response type.
- * @param {RequestMiddleware} param.requestMiddleware - optional array of request middleware functions to process requests.
- * @param {{ level: LogLevel, custom: CustomLogger }} param.logger - optional logger configuration with log level and custom logger.
- * @param {Partial<StorageConfig>} param.storage - optional storage configuration for persisting OIDC tokens.
+ * @param {RequestMiddleware} raw.requestMiddleware - optional array of request middleware functions to process requests.
+ * @param {{ level: LogLevel, custom: CustomLogger }} raw.logger - optional logger configuration with log level and custom logger.
+ * @param {Partial<StorageConfig>} raw.storage - optional storage configuration for persisting OIDC tokens.
+ * @param {unknown} raw.store - optional existing SDK store to share across clients; validated at runtime via `isSdkStoreHandle`.
  * @returns {ReturnType<typeof oidc>} - Returns an object with methods for authorization, token exchange, user info retrieval, and logout.
  */
-export async function oidc<ActionType extends ActionTypes = ActionTypes>({
-  config,
-  requestMiddleware,
-  logger,
-  storage,
-}: {
-  config: OidcConfig;
-  requestMiddleware?: RequestMiddleware<ActionType>[];
-  logger?: {
-    level: LogLevel;
-    custom?: CustomLogger;
-  };
-  storage?: Partial<StorageConfig>;
-}) {
+export async function oidc<ActionType extends ActionTypes = ActionTypes>(
+  raw: RawOidcArgs<ActionType>,
+) {
+  const parsed = parseOidcArgs(raw);
+  if ('type' in parsed) return parsed;
+
+  const { config, requestMiddleware, logger, storage, store: sharedStore } = parsed;
+
   const log = loggerFn({
     level: logger?.level ?? config.log ?? 'error',
     custom: logger?.custom,
   });
   const oauthThreshold = config.oauthThreshold || 30 * 1000; // Default to 30 seconds
+
   const storageClient = createStorage<OauthTokens>({
     type: storage?.type || 'localStorage',
     name: storage?.name || config.clientId,
     prefix: storage?.prefix || 'pic',
     ...storage,
   } as StorageConfig);
-  const store = createClientStore({ requestMiddleware, logger: log });
-
-  if (!config?.serverConfig?.wellknown) {
-    return {
-      error: 'Requires a wellknown url initializing this factory.',
-      type: 'argument_error',
-    };
-  }
-  if (!config?.clientId) {
-    return {
-      error: 'Requires a clientId.',
-      type: 'argument_error',
-    };
-  }
+  const handle = createClientStore({
+    requestMiddleware,
+    logger: log,
+    store: sharedStore,
+    clientId: config.clientId,
+  });
+  const { store } = handle;
 
   const wellknownUrl = config.serverConfig.wellknown;
   const { data, error } = await store.dispatch(
@@ -115,6 +105,8 @@ export async function oidc<ActionType extends ActionTypes = ActionTypes>({
   const useParFlow = config.par ?? data?.require_pushed_authorization_requests === true;
 
   return {
+    /** Pass to another SDK client's `store` option to share this store. */
+    store: handle as SdkStore,
     // Pass store methods to the client
     subscribe: store.subscribe,
 
diff --git a/packages/oidc-client/src/lib/client.store.types.test.ts b/packages/oidc-client/src/lib/client.store.types.test.ts
new file mode 100644
index 00000000000..5e4b5018e87
--- /dev/null
+++ b/packages/oidc-client/src/lib/client.store.types.test.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+import { it, expect, describe } from 'vitest';
+import { logger as loggerFn } from '@forgerock/sdk-logger';
+
+import { parseOidcArgs } from './client.store.utils.js';
+import { createClientStore } from './client.store.utils.js';
+
+import type { OidcConfig } from './config.types.js';
+
+const validConfig: OidcConfig = {
+  clientId: 'test-client',
+  redirectUri: 'https://example.com/callback.html',
+  scope: 'openid profile',
+  serverConfig: { wellknown: 'https://example.com/.well-known/openid-configuration' },
+  responseType: 'code',
+};
+
+describe('parseOidcArgs', () => {
+  it('returns ParsedOidcArgs (no error) when all required fields are present', () => {
+    const result = parseOidcArgs({ config: validConfig });
+
+    expect('type' in result).toBe(false);
+    if ('type' in result) return;
+    expect(result.config.clientId).toBe('test-client');
+    expect(result.config.serverConfig.wellknown).toBe(
+      'https://example.com/.well-known/openid-configuration',
+    );
+    expect(result.store).toBeUndefined();
+  });
+
+  it('returns argument_error when store is a non-SDK-store object', () => {
+    const result = parseOidcArgs({
+      config: validConfig,
+      store: { notAnSdkStore: true, dispatch: () => void 0 },
+    });
+
+    expect(result).toMatchObject({ type: 'argument_error' });
+  });
+
+  it('returns argument_error when config.serverConfig.wellknown is missing', () => {
+    const result = parseOidcArgs({
+      config: { ...validConfig, serverConfig: {} as OidcConfig['serverConfig'] },
+    });
+
+    expect(result).toMatchObject({
+      type: 'argument_error',
+      error: 'Requires a wellknown url initializing this factory.',
+    });
+  });
+
+  it('returns argument_error when config.clientId is missing', () => {
+    const result = parseOidcArgs({
+      config: { ...validConfig, clientId: '' },
+    });
+
+    expect(result).toMatchObject({
+      type: 'argument_error',
+      error: 'Requires a clientId.',
+    });
+  });
+
+  it('returns argument_error when clientId conflicts with the existing store', () => {
+    const log = loggerFn({ level: 'error' });
+    // Create a real store already registered with 'existing-client'.
+    // createClientStore returns a handle that passes isSdkStoreHandle at runtime.
+    const existingHandle = createClientStore({ clientId: 'existing-client', logger: log });
+
+    const result = parseOidcArgs({
+      config: { ...validConfig, clientId: 'different-client' },
+      store: existingHandle,
+    });
+
+    expect(result).toMatchObject({ type: 'argument_error' });
+    if ('type' in result) {
+      expect(result.error).toContain('existing-client');
+      expect(result.error).toContain('Use a separate store per clientId');
+    }
+  });
+});
diff --git a/packages/oidc-client/src/lib/client.store.types.ts b/packages/oidc-client/src/lib/client.store.types.ts
new file mode 100644
index 00000000000..2f3d6a323d0
--- /dev/null
+++ b/packages/oidc-client/src/lib/client.store.types.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import type { ActionTypes, RequestMiddleware } from '@forgerock/sdk-request-middleware';
+import type { SdkStore } from '@forgerock/sdk-store';
+import type { CustomLogger, LogLevel } from '@forgerock/sdk-logger';
+import type { StorageConfig } from '@forgerock/storage';
+
+import type { OidcConfig } from './config.types.js';
+
+/**
+ * The raw, unvalidated input type — this is what public callers pass.
+ * `store` is typed as `unknown` so the parser can perform a runtime
+ * brand-check via `isSdkStoreHandle` before narrowing to `SdkStore`.
+ */
+export type RawOidcArgs<ActionType extends ActionTypes = ActionTypes> = {
+  config: OidcConfig;
+  requestMiddleware?: RequestMiddleware<ActionType>[];
+  logger?: { level: LogLevel; custom?: CustomLogger };
+  storage?: Partial<StorageConfig>;
+  /**
+   * An existing SDK store to attach to, so discovery caching and state are
+   * shared with another client. Omit to create a store for this client alone.
+   * Typed as `unknown` — the parser validates this at runtime via `isSdkStoreHandle`.
+   */
+  store?: unknown;
+};
+
+/**
+ * The parsed, trusted type — all structural validation checks have passed.
+ * The type system records the narrowed facts:
+ * - `config.serverConfig.wellknown` is a non-empty string
+ * - `config.clientId` is a non-empty string
+ * - `store` is either a valid `SdkStore` handle or `undefined`
+ */
+export type ParsedOidcArgs<ActionType extends ActionTypes = ActionTypes> = {
+  config: OidcConfig & {
+    serverConfig: { wellknown: string };
+    clientId: string;
+  };
+  requestMiddleware?: RequestMiddleware<ActionType>[];
+  logger?: { level: LogLevel; custom?: CustomLogger };
+  storage?: Partial<StorageConfig>;
+  store: SdkStore | undefined;
+};
diff --git a/packages/oidc-client/src/lib/client.store.utils.ts b/packages/oidc-client/src/lib/client.store.utils.ts
index a011974bf60..792461a0b2c 100644
--- a/packages/oidc-client/src/lib/client.store.utils.ts
+++ b/packages/oidc-client/src/lib/client.store.utils.ts
@@ -7,51 +7,85 @@
 import type { ActionTypes, RequestMiddleware } from '@forgerock/sdk-request-middleware';
 import { logger as loggerFn } from '@forgerock/sdk-logger';
 
-import { configureStore, type SerializedError } from '@reduxjs/toolkit';
+import { combineSlices, type SerializedError } from '@reduxjs/toolkit';
 import { oidcApi } from './oidc.api.js';
-import { wellknownApi } from './wellknown.api.js';
+import {
+  createSdkStore,
+  injectClient,
+  isSdkStoreHandle,
+  INVALID_STORE_MESSAGE,
+  wellknownApi,
+  getClientForReducerPath,
+} from '@forgerock/sdk-store';
 
 import type { GenericError } from '@forgerock/sdk-types';
+import type { SdkStore, SdkStoreHandle } from '@forgerock/sdk-store';
 import type { FetchBaseQueryError } from '@reduxjs/toolkit/query';
+import type { ParsedOidcArgs, RawOidcArgs } from './client.store.types.js';
+
+/**
+ * The canonical description of the state this client contributes.
+ *
+ * The runtime store is assembled by `injectClient`, which TypeScript cannot
+ * follow across lazy injection. Combining the same slices here lets the state
+ * type be *derived* from them rather than hand-written, so it cannot drift from
+ * what is actually mounted. Exported so the derived state type resolves for
+ * consumers, and so an application can compose the reducer itself if it wants.
+ */
+export const rootReducer = combineSlices(oidcApi, wellknownApi);
+
+export type OidcRootState = ReturnType<typeof rootReducer>;
 
 /**
  * @function createClientStore
- * @description Creates a Redux store configured with OIDC and well-known APIs.
+ * @description Creates, or attaches to, the store backing an OIDC client.
  * @param param - Configuration options for the client store.
- * @param {RequestMiddleware} param.requestMiddleware - An array of request middleware functions to be applied to the store.
- * @param {ReturnType<typeof loggerFn>} param.logger - An optional logger function for logging messages.
- * @returns { ReturnType<typeof configureStore> } - Returns a configured Redux store with OIDC and well-known APIs.
+ * @param {RequestMiddleware} param.requestMiddleware - Request middleware applied to this client's requests only.
+ * @param {ReturnType<typeof loggerFn>} param.logger - An optional logger for this client only.
+ * @param {SdkStore} param.store - An existing SDK store to attach to. Omit to create one.
+ * @returns {SdkStoreHandle<OidcRootState>} - A handle to the store this client is mounted on.
  */
 export function createClientStore<ActionType extends ActionTypes>({
   requestMiddleware,
   logger,
+  store,
+  clientId,
 }: {
   requestMiddleware?: RequestMiddleware<ActionType, unknown>[];
   logger?: ReturnType<typeof loggerFn>;
-}) {
-  return configureStore({
-    reducer: {
-      [oidcApi.reducerPath]: oidcApi.reducer,
-      [wellknownApi.reducerPath]: wellknownApi.reducer,
-    },
-    middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware({
-        thunk: {
-          extraArgument: {
-            /**
-             * This becomes the `api.extra` argument, and will be passed into the
-             * customer query wrapper for `baseQuery`
-             */
-            requestMiddleware,
-            logger,
-          },
-        },
-      })
-        .concat(wellknownApi.middleware)
-        .concat(oidcApi.middleware),
+  store?: SdkStore;
+  clientId?: string;
+}): SdkStoreHandle<OidcRootState> {
+  return injectClient<OidcRootState>(store ?? createSdkStore(), {
+    api: oidcApi,
+    reducerPath: oidcApi.reducerPath,
+    requestMiddleware,
+    logger,
+    clientId,
   });
 }
 
+/**
+ * Reports the clientId already occupying a store's OIDC slot, when it differs
+ * from the one being initialised.
+ *
+ * `oidcApi.reducerPath` is the fixed string 'oidc', so two clients on one store
+ * would share a single RTK Query cache slice and silently overwrite each other's
+ * token state. Detecting that is cheaper than namespacing per clientId, and
+ * failing loudly beats corrupting tokens.
+ *
+ * @returns The conflicting clientId, or `undefined` when there is no conflict.
+ */
+export function conflictingClientId(
+  store: SdkStore | undefined,
+  clientId: string,
+): string | undefined {
+  if (!store) return undefined;
+  const existing = getClientForReducerPath(store, oidcApi.reducerPath);
+  if (!existing) return undefined;
+  return existing.clientId && existing.clientId !== clientId ? existing.clientId : undefined;
+}
+
 /**
  * @function createLogoutError
  * @description Creates a logout error object based on the provided data and error.
@@ -113,3 +147,61 @@ export function createTokenError(type: 'no_tokens' | 'no_access_token' | 'no_id_
 
   return error;
 }
+
+/**
+ * @function parseOidcArgs
+ * @description Pure, synchronous parser for OIDC factory arguments that implements
+ *              the "parse, don't validate" pattern. Returns a narrowed
+ *              {@link ParsedOidcArgs} on success, or a {@link GenericError} describing
+ *              the first structural failure found.
+ *
+ *              The PAR check (which requires a network round-trip) is intentionally
+ *              excluded — it belongs in `oidc()` after the wellknown fetch.
+ * @param raw - The unvalidated arguments to parse.
+ * @returns {ParsedOidcArgs<ActionType> | GenericError}
+ */
+export function parseOidcArgs<ActionType extends ActionTypes = ActionTypes>(
+  raw: RawOidcArgs<ActionType>,
+): ParsedOidcArgs<ActionType> | GenericError {
+  /**
+   * Validate before touching the store. RTK's `inject` is irreversible, so
+   * mutating a caller-owned store and *then* rejecting the arguments would leave
+   * them permanently carrying a slice from a call that never succeeded.
+   */
+  if (raw.store !== undefined && !isSdkStoreHandle(raw.store)) {
+    return {
+      error: INVALID_STORE_MESSAGE,
+      type: 'argument_error',
+    };
+  }
+  if (!raw.config?.serverConfig?.wellknown) {
+    return {
+      error: 'Requires a wellknown url initializing this factory.',
+      type: 'argument_error',
+    };
+  }
+  if (!raw.config?.clientId) {
+    return {
+      error: 'Requires a clientId.',
+      type: 'argument_error',
+    };
+  }
+
+  /**
+   * `oidcApi.reducerPath` is a fixed string, so a second client on the same
+   * store would share one cache slice and clobber the first client's tokens.
+   * Re-initialising the same clientId is fine and stays idempotent.
+   */
+  const validatedStore = raw.store as SdkStore | undefined;
+  const conflict = conflictingClientId(validatedStore, raw.config.clientId);
+  if (conflict) {
+    return {
+      error:
+        `This store is already in use by an OIDC client with clientId '${conflict}'. ` +
+        'Use a separate store per clientId.',
+      type: 'argument_error',
+    };
+  }
+
+  return raw as unknown as ParsedOidcArgs<ActionType>;
+}
diff --git a/packages/oidc-client/src/lib/client.types.ts b/packages/oidc-client/src/lib/client.types.ts
index 6a04c919b38..48e77159e5a 100644
--- a/packages/oidc-client/src/lib/client.types.ts
+++ b/packages/oidc-client/src/lib/client.types.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
  *
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
@@ -11,7 +11,11 @@ import { oidc } from './client.store.js';
 
 export type OidcClient = Awaited<ReturnType<typeof oidc>>;
 
-export type ClientStore = ReturnType<typeof createClientStore>;
+/**
+ * The inner Redux store. `createClientStore` returns a handle carrying the
+ * store plus the injection seams; internal code only ever needs the store.
+ */
+export type ClientStore = ReturnType<typeof createClientStore>['store'];
 
 export type RootState = ReturnType<ClientStore['getState']>;
 
diff --git a/packages/oidc-client/src/lib/logout.request.test.ts b/packages/oidc-client/src/lib/logout.request.test.ts
index 1beaf712f43..608bf7e75c5 100644
--- a/packages/oidc-client/src/lib/logout.request.test.ts
+++ b/packages/oidc-client/src/lib/logout.request.test.ts
@@ -84,7 +84,7 @@ const storageClient = createStorage<OauthTokens>({
 });
 
 const logger = loggerFn({ level: 'error' });
-const store = createClientStore({ logger });
+const { store } = createClientStore({ logger });
 
 const tokens = {
   accessToken: '1234567890',
diff --git a/packages/oidc-client/src/lib/oidc.api.ts b/packages/oidc-client/src/lib/oidc.api.ts
index be666dcf7b1..36eb5dc8a26 100644
--- a/packages/oidc-client/src/lib/oidc.api.ts
+++ b/packages/oidc-client/src/lib/oidc.api.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
  *
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
@@ -21,7 +21,8 @@ import {
   type RequestMiddleware,
 } from '@forgerock/sdk-request-middleware';
 
-import type { logger as loggerFn } from '@forgerock/sdk-logger';
+import { logger as loggerFn } from '@forgerock/sdk-logger';
+import { clientExtra } from '@forgerock/sdk-store';
 import type { TokenExchangeResponse } from './exchange.types.js';
 import type { AuthorizationSuccess, AuthorizeSuccessResponse } from './authorize.request.types.js';
 import type { UserInfoResponse } from './client.types.js';
@@ -31,18 +32,43 @@ import type { SessionCheckResponseType } from './session.types.js';
 
 const IFRAME_TIMEOUT_MS = 3000;
 
+const OIDC_REDUCER_PATH = 'oidc';
+
+/**
+ * This client's private slot on the store's `extraArgument`.
+ *
+ * Both fields are optional because a shared store may not have had an oidc slot
+ * registered yet; `oidcExtra` substitutes safe defaults so an endpoint can never
+ * fail on a missing slot.
+ */
 interface Extras<ActionType extends ActionTypes = ActionTypes, Payload = unknown> {
-  requestMiddleware: RequestMiddleware<ActionType, Payload>[];
-  logger: ReturnType<typeof loggerFn>;
+  requestMiddleware?: RequestMiddleware<ActionType, Payload>[];
+  logger?: ReturnType<typeof loggerFn>;
+}
+
+/** Fallback so a missing slot degrades to error-level logging, never a crash. */
+const fallbackLogger = loggerFn({ level: 'error' });
+
+/**
+ * Resolves this client's own middleware and logger.
+ *
+ * Reads only the `oidc` slot — never a store-wide value, which on a shared
+ * store would belong to whichever client created it.
+ */
+function oidcExtra(extra: unknown): Required<Extras> {
+  return clientExtra(extra, OIDC_REDUCER_PATH, {
+    requestMiddleware: [],
+    logger: fallbackLogger,
+  });
 }
 
 export const oidcApi = createApi({
-  reducerPath: 'oidc',
+  reducerPath: OIDC_REDUCER_PATH,
   baseQuery: fetchBaseQuery(),
   endpoints: (builder) => ({
     authorizeFetch: builder.mutation<AuthorizeSuccessResponse, { url: string }>({
       queryFn: async ({ url }, api, _, baseQuery) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
 
         const request: FetchArgs = {
           url,
@@ -111,7 +137,7 @@ export const oidcApi = createApi({
     }),
     par: builder.mutation<PushAuthorizationResponse, { endpoint: string; body: URLSearchParams }>({
       queryFn: async ({ endpoint, body }, api, _, baseQuery) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
 
         const request: FetchArgs = {
           url: endpoint,
@@ -187,7 +213,7 @@ export const oidcApi = createApi({
       { url: string; responseType: SessionCheckResponseType }
     >({
       queryFn: async ({ url, responseType }, api) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
         const errorParams = ['error', 'error_description'];
 
         const request: FetchArgs = { url };
@@ -271,7 +297,7 @@ export const oidcApi = createApi({
     }),
     sessionCheckFetch: builder.mutation<{ status: 204 }, { url: string }>({
       queryFn: async ({ url }, api, _, baseQuery) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
 
         const request: FetchArgs = {
           url,
@@ -314,7 +340,7 @@ export const oidcApi = createApi({
     }),
     authorizeIframe: builder.mutation<AuthorizationSuccess, { url: string }>({
       queryFn: async ({ url }, api) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
 
         const request: FetchArgs = {
           url,
@@ -401,7 +427,7 @@ export const oidcApi = createApi({
       { idToken: string; endpoint: string; signOutRedirectUri?: string }
     >({
       queryFn: async ({ idToken, endpoint, signOutRedirectUri }, api, _, baseQuery) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
 
         const url = new URL(endpoint);
         url.searchParams.append('id_token_hint', idToken);
@@ -456,7 +482,7 @@ export const oidcApi = createApi({
       }
     >({
       queryFn: async ({ code, config, endpoint, verifier }, api, _, baseQuery) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
 
         const { clientId, redirectUri } = config;
         const body = new URLSearchParams({
@@ -515,7 +541,7 @@ export const oidcApi = createApi({
     }),
     revoke: builder.mutation<object, { accessToken: string; clientId?: string; endpoint: string }>({
       queryFn: async ({ accessToken, clientId, endpoint }, api, _, baseQuery) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
 
         const body = new URLSearchParams({
           ...(clientId ? { client_id: clientId } : {}),
@@ -565,7 +591,7 @@ export const oidcApi = createApi({
     }),
     userInfo: builder.mutation<UserInfoResponse, { accessToken: string; endpoint: string }>({
       queryFn: async ({ accessToken, endpoint }, api, _, baseQuery) => {
-        const { requestMiddleware, logger } = api.extra as Extras;
+        const { requestMiddleware, logger } = oidcExtra(api.extra);
 
         const request: FetchArgs = {
           url: endpoint,
diff --git a/packages/oidc-client/src/lib/shared-store.test.ts b/packages/oidc-client/src/lib/shared-store.test.ts
new file mode 100644
index 00000000000..517749e22cf
--- /dev/null
+++ b/packages/oidc-client/src/lib/shared-store.test.ts
@@ -0,0 +1,215 @@
+// @vitest-environment node
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { createSdkStore, isSdkStoreHandle, wellknownApi } from '@forgerock/sdk-store';
+import { oidc } from './client.store.js';
+import { createClientStore } from './client.store.utils.js';
+import { oidcApi } from './oidc.api.js';
+
+import type { OidcConfig } from './config.types.js';
+
+/**
+ * Coverage for the three store-ownership modes.
+ *
+ * An earlier version of these tests hand-built a lookalike handle from RTK
+ * primitives specifically to avoid importing another client package. That made
+ * them blind to the only failure mode this feature really has: the producing and
+ * consuming sides of the handle drifting apart. Everything here goes through the
+ * real `createSdkStore()` and the real `oidc()` factory instead.
+ */
+
+const TEST_WELLKNOWN_URL =
+  'https://example.pingone.com/test-env/as/.well-known/openid-configuration';
+
+const mockWellknownResponse = {
+  issuer: 'https://example.pingone.com/test-env/as',
+  authorization_endpoint: 'https://example.pingone.com/test-env/as/authorize',
+  token_endpoint: 'https://example.pingone.com/test-env/as/token',
+  userinfo_endpoint: 'https://example.pingone.com/test-env/as/userinfo',
+  jwks_uri: 'https://example.pingone.com/test-env/as/jwks',
+  revocation_endpoint: 'https://example.pingone.com/test-env/as/revoke',
+  introspection_endpoint: 'https://example.pingone.com/test-env/as/introspect',
+  pushed_authorization_request_endpoint: 'https://example.pingone.com/test-env/as/par',
+};
+
+const oidcConfig: OidcConfig = {
+  clientId: 'test-client-id',
+  redirectUri: 'http://localhost/callback',
+  scope: 'openid profile',
+  serverConfig: { wellknown: TEST_WELLKNOWN_URL },
+  responseType: 'code',
+};
+
+function makeStorageStub() {
+  const store = new Map<string, string>();
+  return {
+    getItem: (key: string) => store.get(key) ?? null,
+    setItem: (key: string, value: string) => store.set(key, value),
+    removeItem: (key: string) => store.delete(key),
+    clear: () => store.clear(),
+    get length() {
+      return store.size;
+    },
+    key: (i: number) => [...store.keys()][i] ?? null,
+  };
+}
+
+let wellknownFetchCount = 0;
+
+beforeEach(() => {
+  wellknownFetchCount = 0;
+  vi.stubGlobal('localStorage', makeStorageStub());
+  vi.stubGlobal('sessionStorage', makeStorageStub());
+  vi.spyOn(globalThis, 'fetch').mockImplementation(async (input) => {
+    const url = typeof input === 'string' ? input : (input as Request).url;
+
+    if (url.includes('.well-known')) {
+      wellknownFetchCount++;
+      return new Response(JSON.stringify(mockWellknownResponse), {
+        status: 200,
+        headers: { 'Content-Type': 'application/json' },
+      });
+    }
+
+    return new Response(JSON.stringify({}), {
+      status: 200,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  });
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+  vi.restoreAllMocks();
+  wellknownApi.util.resetApiState();
+  oidcApi.util.resetApiState();
+});
+
+describe('mode 1 — implicit store (default, unchanged behaviour)', () => {
+  it('creates its own store and returns a working client', async () => {
+    // Act
+    const client = await oidc({ config: oidcConfig });
+
+    // Assert
+    if ('error' in client) throw new Error(`Expected oidc client, got ${client.error}`);
+    expect(client.subscribe).toBeInstanceOf(Function);
+    expect(client.token).toBeDefined();
+    expect(client.authorize).toBeDefined();
+  });
+
+  it('fetches the discovery document exactly once', async () => {
+    // Act
+    await oidc({ config: oidcConfig });
+
+    // Assert — absolute, not "greater than zero"
+    expect(wellknownFetchCount).toBe(1);
+  });
+
+  it('does not share state between two independent clients', async () => {
+    // Act
+    const first = createClientStore({});
+    const second = createClientStore({});
+
+    // Assert
+    expect(first.store).not.toBe(second.store);
+  });
+});
+
+describe('mode 3 — consumer-owned store', () => {
+  it('accepts a store created by createSdkStore()', async () => {
+    // Arrange
+    const store = createSdkStore();
+
+    // Act
+    const client = await oidc({ config: oidcConfig, store });
+
+    // Assert
+    if ('error' in client) throw new Error(`Expected oidc client, got ${client.error}`);
+    expect(client.token).toBeDefined();
+  });
+
+  it('mounts the oidc slice onto the provided store', async () => {
+    // Arrange
+    const store = createSdkStore();
+
+    // Act
+    await oidc({ config: oidcConfig, store });
+
+    // Assert
+    expect(Object.keys(store.store.getState() as object)).toContain(oidcApi.reducerPath);
+  });
+
+  it('registers only the oidc slot on the shared registry', async () => {
+    // Arrange
+    const store = createSdkStore();
+
+    // Act
+    await oidc({ config: oidcConfig, store });
+
+    // Assert
+    expect(Object.keys(store.extra.clients)).toEqual([oidcApi.reducerPath]);
+  });
+
+  it('reuses a discovery document already cached on the shared store', async () => {
+    // Arrange — simulate the owning client having already fetched it
+    const store = createSdkStore();
+    await store.store.dispatch(
+      wellknownApi.endpoints.configuration.initiate(TEST_WELLKNOWN_URL) as never,
+    );
+    expect(wellknownFetchCount).toBe(1);
+
+    // Act
+    await oidc({ config: oidcConfig, store });
+
+    // Assert — still exactly one, so oidc served from cache
+    expect(wellknownFetchCount).toBe(1);
+  });
+
+  it('honours this client\u2019s own requestMiddleware on a shared store', async () => {
+    // Arrange
+    const store = createSdkStore();
+
+    // Act
+    await oidc({
+      config: oidcConfig,
+      store,
+      requestMiddleware: [
+        (_req, _action, next) => {
+          next();
+        },
+      ],
+    });
+
+    // Assert — middleware is no longer discarded on the shared path
+    expect(store.extra.clients[oidcApi.reducerPath]?.requestMiddleware).toHaveLength(1);
+  });
+});
+
+describe('store handle contract', () => {
+  it('the handle produced for a client satisfies the shared guard', () => {
+    // Arrange / Act
+    const handle = createClientStore({});
+
+    // Assert — the producing side of the contract
+    expect(isSdkStoreHandle(handle)).toBe(true);
+  });
+
+  it('rejects a value that is not a store handle', async () => {
+    // Act
+    const client = await oidc({
+      config: oidcConfig,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      store: { not: 'a store' } as any,
+    });
+
+    // Assert — a clear argument error, not a TypeError from inside RTK
+    expect(client).toHaveProperty('type', 'argument_error');
+    expect((client as { error: string }).error).toMatch(/not a valid SDK store/i);
+  });
+});
diff --git a/packages/oidc-client/src/lib/store-lifecycle.test.ts b/packages/oidc-client/src/lib/store-lifecycle.test.ts
new file mode 100644
index 00000000000..df43202f188
--- /dev/null
+++ b/packages/oidc-client/src/lib/store-lifecycle.test.ts
@@ -0,0 +1,169 @@
+// @vitest-environment node
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { createSdkStore, wellknownApi } from '@forgerock/sdk-store';
+import { oidc } from './client.store.js';
+import { oidcApi } from './oidc.api.js';
+
+import type { OidcConfig } from './config.types.js';
+
+/**
+ * Lifecycle guarantees for a store the caller owns.
+ *
+ * RTK's `inject` is irreversible, so mutating a caller's store before the
+ * arguments have been validated leaves it permanently carrying a slice from a
+ * call that never succeeded. And because `oidcApi.reducerPath` is the fixed
+ * string 'oidc', two clients with different clientIds on one store would share
+ * a single cache slice and silently clobber each other's tokens.
+ */
+
+const TEST_WELLKNOWN_URL =
+  'https://example.pingone.com/test-env/as/.well-known/openid-configuration';
+
+const mockWellknownResponse = {
+  issuer: 'https://example.pingone.com/test-env/as',
+  authorization_endpoint: 'https://example.pingone.com/test-env/as/authorize',
+  token_endpoint: 'https://example.pingone.com/test-env/as/token',
+  userinfo_endpoint: 'https://example.pingone.com/test-env/as/userinfo',
+  jwks_uri: 'https://example.pingone.com/test-env/as/jwks',
+  revocation_endpoint: 'https://example.pingone.com/test-env/as/revoke',
+};
+
+const oidcConfig: OidcConfig = {
+  clientId: 'test-client-id',
+  redirectUri: 'http://localhost/callback',
+  scope: 'openid profile',
+  serverConfig: { wellknown: TEST_WELLKNOWN_URL },
+  responseType: 'code',
+};
+
+function makeStorageStub() {
+  const store = new Map<string, string>();
+  return {
+    getItem: (key: string) => store.get(key) ?? null,
+    setItem: (key: string, value: string) => store.set(key, value),
+    removeItem: (key: string) => store.delete(key),
+    clear: () => store.clear(),
+    get length() {
+      return store.size;
+    },
+    key: (i: number) => [...store.keys()][i] ?? null,
+  };
+}
+
+beforeEach(() => {
+  vi.stubGlobal('localStorage', makeStorageStub());
+  vi.stubGlobal('sessionStorage', makeStorageStub());
+  vi.spyOn(globalThis, 'fetch').mockImplementation(
+    async () =>
+      new Response(JSON.stringify(mockWellknownResponse), {
+        status: 200,
+        headers: { 'Content-Type': 'application/json' },
+      }),
+  );
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+  vi.restoreAllMocks();
+  wellknownApi.util.resetApiState();
+  oidcApi.util.resetApiState();
+});
+
+describe('a failed oidc() leaves a caller-owned store untouched', () => {
+  it('does not mount the oidc slice when wellknown is missing', async () => {
+    // Arrange
+    const store = createSdkStore();
+
+    // Act
+    const result = await oidc({
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      config: { ...oidcConfig, serverConfig: {} } as any,
+      store,
+    });
+
+    // Assert
+    expect(result).toHaveProperty('type', 'argument_error');
+    expect(Object.keys(store.store.getState() as object)).not.toContain(oidcApi.reducerPath);
+  });
+
+  it('does not register a client slot when clientId is missing', async () => {
+    // Arrange
+    const store = createSdkStore();
+
+    // Act
+    const result = await oidc({
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      config: { ...oidcConfig, clientId: '' } as any,
+      store,
+    });
+
+    // Assert
+    expect(result).toHaveProperty('type', 'argument_error');
+    expect(store.extra.clients).toEqual({});
+  });
+
+  it('leaves the store reusable for a subsequent valid call', async () => {
+    // Arrange
+    const store = createSdkStore();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await oidc({ config: { ...oidcConfig, clientId: '' } as any, store });
+
+    // Act — the caller fixes their config and retries on the same store
+    const client = await oidc({ config: oidcConfig, store });
+
+    // Assert
+    if ('error' in client) throw new Error(`Expected oidc client, got ${client.error}`);
+    expect(Object.keys(store.extra.clients)).toEqual([oidcApi.reducerPath]);
+  });
+});
+
+describe('one oidc client per shared store', () => {
+  it('is idempotent when re-initialised with the same clientId', async () => {
+    // Arrange
+    const store = createSdkStore();
+    await oidc({ config: oidcConfig, store });
+
+    // Act
+    const second = await oidc({ config: oidcConfig, store });
+
+    // Assert — re-init is a legitimate operation
+    if ('error' in second) throw new Error(`Expected oidc client, got ${second.error}`);
+    expect(second.token).toBeDefined();
+  });
+
+  it('errors when a second client with a different clientId joins the same store', async () => {
+    // Arrange
+    const store = createSdkStore();
+    await oidc({ config: oidcConfig, store });
+
+    // Act
+    const second = await oidc({
+      config: { ...oidcConfig, clientId: 'a-different-client' },
+      store,
+    });
+
+    // Assert — silently sharing one 'oidc' cache slice would clobber tokens
+    expect(second).toHaveProperty('type', 'argument_error');
+    expect((second as { error: string }).error).toMatch(/clientId/i);
+  });
+
+  it('allows different clientIds on separate stores', async () => {
+    // Act
+    const first = await oidc({ config: oidcConfig, store: createSdkStore() });
+    const second = await oidc({
+      config: { ...oidcConfig, clientId: 'a-different-client' },
+      store: createSdkStore(),
+    });
+
+    // Assert
+    expect('error' in first).toBe(false);
+    expect('error' in second).toBe(false);
+  });
+});
diff --git a/packages/oidc-client/src/types.ts b/packages/oidc-client/src/types.ts
index 6a17dcbfef9..ab2c3a7f08d 100644
--- a/packages/oidc-client/src/types.ts
+++ b/packages/oidc-client/src/types.ts
@@ -1,4 +1,5 @@
-/* Copyright © 2025 - 2026 Ping Identity Corporation. All rights reserved.
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
  *
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
@@ -22,4 +23,12 @@ export type { StorageConfig } from '@forgerock/storage';
 
 // Re-export functions needed to resolve OidcClient and ClientStore type aliases
 export { oidc } from './lib/client.store.js';
+// RawOidcArgs is a parameter type of oidc() and must be re-exported so consumers can type call-sites
+export type { RawOidcArgs } from './lib/client.store.types.js';
 export { createClientStore } from './lib/client.store.utils.js';
+// Referenced by createClientStore's return type, so consumers need the names.
+export type { OidcRootState } from './lib/client.store.utils.js';
+export { rootReducer } from './lib/client.store.utils.js';
+
+import { oidc } from './lib/client.store.js';
+export type OidcClient = Awaited<ReturnType<typeof oidc>>;
diff --git a/packages/oidc-client/tsconfig.lib.json b/packages/oidc-client/tsconfig.lib.json
index d689866941f..7335f658954 100644
--- a/packages/oidc-client/tsconfig.lib.json
+++ b/packages/oidc-client/tsconfig.lib.json
@@ -39,6 +39,9 @@
     },
     {
       "path": "../sdk-effects/iframe-manager/tsconfig.lib.json"
+    },
+    {
+      "path": "../sdk-effects/store/tsconfig.lib.json"
     }
   ],
   "exclude": [
diff --git a/packages/sdk-effects/oidc/src/index.ts b/packages/sdk-effects/oidc/src/index.ts
index 6ed59d5aa9a..48e3fb9726e 100644
--- a/packages/sdk-effects/oidc/src/index.ts
+++ b/packages/sdk-effects/oidc/src/index.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
  *
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
@@ -8,4 +8,3 @@
 export * from './lib/authorize.effects.js';
 export * from './lib/authorize.utils.js';
 export * from './lib/state-pkce.effects.js';
-export * from './lib/wellknown.effects.js';
diff --git a/packages/sdk-effects/store/README.md b/packages/sdk-effects/store/README.md
new file mode 100644
index 00000000000..0a872aaf9ac
--- /dev/null
+++ b/packages/sdk-effects/store/README.md
@@ -0,0 +1,306 @@
+# @forgerock/sdk-store
+
+Shared Redux store infrastructure and OpenID Connect discovery API for the Ping JavaScript SDK.
+
+This is an internal building block. You do not normally install it directly — `@forgerock/oidc-client`, `@forgerock/davinci-client`, and `@forgerock/journey-client` depend on it. Install it explicitly only if your application wants to own the SDK store itself.
+
+## Table of Contents
+
+- [Why this package exists](#why-this-package-exists)
+- [Installation](#installation)
+- [Sharing a store between clients](#sharing-a-store-between-clients)
+- [Well-known discovery](#well-known-discovery)
+- [API Reference](#api-reference)
+- [Building](#building)
+- [Testing](#testing)
+
+## Why this package exists
+
+Every SDK client needs the authorization server's OpenID Connect discovery document. Before this package, each client package defined its own `wellknownApi` instance. Three separate RTK Query APIs meant three separate caches, so an application using more than one client fetched the same `.well-known/openid-configuration` document once per client.
+
+This package holds the **single canonical `wellknownApi` instance**. When SDK clients share a Redux store, they share one cache entry per URL, and the discovery document is fetched exactly once.
+
+## Installation
+
+```bash
+pnpm add @forgerock/sdk-store
+```
+
+## Sharing a store between clients
+
+An application using more than one SDK client can have them share a single Redux store, so the discovery document is fetched once and state lives in one place. There are three ways to arrange this, and the default requires no changes at all.
+
+### Mode 1 — implicit (default)
+
+Each client creates its own store. Nothing is shared. This is the behaviour you get by omitting `store`, and it is what every existing application already does.
+
+```typescript
+const client = await oidc({ config });
+```
+
+### Mode 2 — one client owns the store
+
+`davinci()` and `journey()` expose the store they created as `client.store`. Pass it to another client to attach to it. This is the common case.
+
+```typescript
+const davinciClient = await davinci({ config: davinciConfig });
+const oidcClient = await oidc({ config: oidcConfig, store: davinciClient.store });
+// The discovery document was fetched by davinci(); oidc() reads it from cache.
+```
+
+### Mode 3 — the application owns the store
+
+Call `createSdkStore()` yourself when you want to control the store's lifetime, or to attach clients in an order that has no natural owner.
+
+```typescript
+import { createSdkStore } from '@forgerock/sdk-store';
+
+const store = createSdkStore();
+const davinciClient = await davinci({ config: davinciConfig, store });
+const oidcClient = await oidc({ config: oidcConfig, store });
+```
+
+### What is shared, and what is not
+
+Sharing a store shares **cached data**, not **configuration**. This distinction matters:
+
+| Shared across clients                              | Private to each client |
+| -------------------------------------------------- | ---------------------- |
+| The well-known discovery cache (one fetch per URL) | `requestMiddleware`    |
+| The Redux state tree and its subscribers           | `logger`               |
+
+Each client's `requestMiddleware` and `logger` are registered under its own key on the store and are resolved only by that client's own requests. A middleware you pass to `davinci()` will never run against an OIDC token exchange, and vice versa. Pass them to the client whose requests they are meant to affect:
+
+```typescript
+const store = createSdkStore();
+
+// Applies only to DaVinci flow requests.
+await davinci({ config: davinciConfig, store, requestMiddleware: [davinciMiddleware] });
+
+// Applies only to OIDC requests (authorize, token, revoke, userinfo, end session).
+await oidc({ config: oidcConfig, store, requestMiddleware: [oidcMiddleware] });
+```
+
+### Limitations
+
+- **One OIDC client per store.** `oidcApi` mounts at a fixed key, so two OIDC clients on one store would share a single cache slice and overwrite each other's token state. Initialising a second client with a _different_ `clientId` returns an `argument_error`; re-initialising the _same_ `clientId` is allowed and idempotent. Use a separate store per `clientId`.
+- **Attaching is permanent.** A client cannot be detached from a store. Discard the store instead.
+
+## Well-known discovery
+
+`wellknownApi` is a standard RTK Query API. Mount its reducer and middleware, then dispatch the `configuration` endpoint with the discovery URL as the cache key.
+
+```typescript
+import { configureStore } from '@reduxjs/toolkit';
+import { wellknownApi, wellknownSelector } from '@forgerock/sdk-store';
+
+const store = configureStore({
+  reducer: { [wellknownApi.reducerPath]: wellknownApi.reducer },
+  middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(wellknownApi.middleware),
+});
+
+const url = 'https://auth.example.com/as/.well-known/openid-configuration';
+
+// Fetches on first call; served from cache thereafter.
+const { data, error } = await store.dispatch(wellknownApi.endpoints.configuration.initiate(url));
+
+// Or read the cached value out of state at any time.
+const wellknown = wellknownSelector(url, store.getState());
+```
+
+The endpoint never throws. A network failure, a non-2xx response, or a payload missing the required `issuer` / `authorization_endpoint` / `token_endpoint` fields all resolve to `{ error }`.
+
+## API Reference
+
+### `createSdkStore()`
+
+```typescript
+function createSdkStore(): SdkStore;
+```
+
+Creates a Redux store that SDK clients can share. The well-known discovery slice is mounted up front; all other slices are injected lazily via `injectClient()`. Applications may call this directly when they want to own the store's lifetime; otherwise each client factory creates one on demand.
+
+### `injectClient<S>(handle, options)`
+
+```typescript
+function injectClient<S extends object = Record<string, unknown>>(
+  handle: SdkStore,
+  options: InjectClientOptions,
+): SdkStoreHandle<S>;
+```
+
+Attaches a client to an existing store: mounts its RTK Query API reducer and middleware, injects any additional slices, and registers the client's private configuration slot. Safe to call multiple times for the same client — RTK deduplicates reducer injection. Throws `Error` (using `INVALID_STORE_MESSAGE`) if `handle` is not a valid SDK store handle.
+
+### `isSdkStoreHandle(value)`
+
+```typescript
+function isSdkStoreHandle(value: unknown): value is SdkStore;
+```
+
+Type guard. Returns `true` when `value` structurally matches a valid SDK store handle (i.e. it was produced by `createSdkStore()` or returned by a client factory). Used by client factories to validate caller-supplied `store` arguments before touching the store.
+
+### `INVALID_STORE_MESSAGE`
+
+```typescript
+const INVALID_STORE_MESSAGE: string;
+```
+
+Human-readable error message emitted whenever an argument fails the `isSdkStoreHandle()` check. Exported so every client package references the same string rather than duplicating it.
+
+### `clientExtra<Slot>(extra, reducerPath, defaults?)`
+
+```typescript
+function clientExtra<Slot extends object>(
+  extra: unknown,
+  reducerPath: string,
+  defaults?: Partial<Slot>,
+): Slot;
+```
+
+Resolves the calling client's own per-client slot from a store's thunk `extraArgument`. Runs on every request and never throws — an unrecognised `extra` yields `defaults` (or `{}`) instead of an error. When `defaults` are supplied, any slot key that is absent or `undefined` is filled from `defaults`.
+
+### `initWellknownQuery(url)`
+
+```typescript
+function initWellknownQuery(url: string): {
+  applyQuery(callback: QueryCallback): Promise<WellknownQueryResult<WellknownResponse>>;
+};
+```
+
+Creates a well-known query builder for use inside an RTK Query `queryFn`. Constructs the fetch request (with `Accept: application/json`), executes it through the provided `callback`, and validates the response via `isValidWellknownResponse`. Network failures and invalid responses are both normalised to a structured `WellknownQueryError`.
+
+```typescript
+queryFn: async (url, _api, _extra, baseQuery) => {
+  return initWellknownQuery(url).applyQuery(async (req) => await baseQuery(req));
+};
+```
+
+### `isValidWellknownResponse(data)`
+
+```typescript
+function isValidWellknownResponse(data: unknown): data is WellknownResponse;
+```
+
+Returns `true` when `data` contains the minimum required OIDC well-known fields: `issuer`, `authorization_endpoint`, and `token_endpoint` (all strings).
+
+### Types
+
+#### `SdkStore`
+
+```typescript
+interface SdkStore {
+  readonly store: {
+    getState: () => unknown;
+    dispatch: (action: never) => unknown;
+    subscribe: (listener: () => void) => () => void;
+  };
+  readonly rootReducer: InjectableRootReducer;
+  readonly dynamicMiddleware: DynamicMiddleware;
+  readonly extra: SdkStoreRegistry;
+}
+```
+
+State-agnostic shared Redux store contract. This is the type that travels between client packages: `davinci()` and `journey()` expose one as `client.store`; `oidc()` and `journey()` accept one as the `store` option.
+
+#### `SdkStoreHandle<S>`
+
+```typescript
+interface SdkStoreHandle<S extends object = Record<string, unknown>> extends SdkStore {
+  readonly store: Store<S, UnknownAction> & {
+    dispatch: ThunkDispatch<S, SdkStoreRegistry, UnknownAction>;
+  };
+  readonly rootReducer: InjectableRootReducer & Reducer<S>;
+}
+```
+
+Store handle with a known state shape `S`. Returned by each client's own store factory so internal code gets full typing on `getState()` and `dispatch()`. Assignable to `SdkStore` for hand-off to another client.
+
+#### `SdkStoreRegistry`
+
+```typescript
+interface SdkStoreRegistry {
+  readonly clients: Record<string, ClientSlot>;
+}
+```
+
+The mutable client registry carried as the store's `extraArgument`. `configureStore` captures this by reference, so slots added after store creation are visible to every subsequent request.
+
+#### `ClientSlot`
+
+```typescript
+interface ClientSlot {
+  readonly requestMiddleware?: readonly unknown[];
+  readonly logger?: unknown;
+  readonly clientId?: string;
+}
+```
+
+Per-client slot on a store's thunk `extraArgument`. Intentionally loose so `sdk-store` does not depend on `sdk-request-middleware` or `sdk-logger` types. Each client narrows this to its own concrete shape at the point of use.
+
+#### `InjectClientOptions`
+
+```typescript
+interface InjectClientOptions {
+  readonly api: { reducerPath: string; reducer: Reducer; middleware: Middleware };
+  readonly reducerPath: string;
+  readonly slices?: readonly { name: string; reducer: Reducer }[];
+  readonly requestMiddleware?: readonly unknown[];
+  readonly logger?: unknown;
+  readonly clientId?: string;
+}
+```
+
+Options passed to `injectClient()` describing the client attaching itself to a store. `api` provides the RTK Query API (its reducer and middleware are both mounted). `slices` lists any additional Redux slices the client owns. `reducerPath` is used as the registry key — normally matches `api.reducerPath`.
+
+### `wellknownApi`
+
+The canonical RTK Query API instance. `reducerPath` is `'wellknown'`.
+
+| Member                                 | Description                                                                                                 |
+| -------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
+| `wellknownApi.reducer`                 | Mount at `wellknownApi.reducerPath`                                                                         |
+| `wellknownApi.middleware`              | Add to the store middleware chain                                                                           |
+| `wellknownApi.endpoints.configuration` | `builder.query<WellknownResponse, string>` — the argument is the discovery URL and doubles as the cache key |
+
+### `createWellknownSelector(wellknownUrl)`
+
+Returns a memoized selector for the cached discovery document, or `undefined` if it has not been fetched.
+
+Repeated calls with the same URL return the **same selector instance**, so memoization is shared across call sites rather than being rebuilt (and therefore always cold) on each call.
+
+```typescript
+const selectWellknown = createWellknownSelector(url);
+const wellknown = selectWellknown(store.getState());
+
+createWellknownSelector(url) === createWellknownSelector(url); // true
+```
+
+### `wellknownSelector(wellknownUrl, state)`
+
+Convenience wrapper that resolves the selector and immediately applies it to `state`. Use this for one-off reads; use `createWellknownSelector` when you want to hold the selector.
+
+```typescript
+const wellknown = wellknownSelector(url, store.getState());
+```
+
+### `WellknownState`
+
+The minimum state shape required by the selectors. Useful for constraining generic state types:
+
+```typescript
+function readIssuer<S extends WellknownState>(url: string, state: S) {
+  return wellknownSelector(url, state)?.issuer;
+}
+```
+
+## Building
+
+```bash
+pnpm nx build @forgerock/sdk-store
+```
+
+## Testing
+
+```bash
+pnpm nx test @forgerock/sdk-store
+```
diff --git a/packages/sdk-effects/store/eslint.config.mjs b/packages/sdk-effects/store/eslint.config.mjs
new file mode 100644
index 00000000000..550383b33f6
--- /dev/null
+++ b/packages/sdk-effects/store/eslint.config.mjs
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import baseConfig from '../../../eslint.config.mjs';
+
+export default [
+  ...baseConfig,
+  {
+    files: ['**/*.json'],
+    rules: {
+      '@nx/dependency-checks': [
+        'warn',
+        {
+          ignoredFiles: [
+            '{projectRoot}/eslint.config.{js,cjs,mjs}',
+            '{projectRoot}/vite.config.{js,ts,mjs,mts}',
+          ],
+        },
+      ],
+    },
+    languageOptions: {
+      parser: (await import('jsonc-eslint-parser')).default,
+    },
+  },
+];
diff --git a/packages/sdk-effects/store/package.json b/packages/sdk-effects/store/package.json
new file mode 100644
index 00000000000..9a2eb694520
--- /dev/null
+++ b/packages/sdk-effects/store/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "@forgerock/sdk-store",
+  "version": "0.0.0",
+  "private": false,
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ForgeRock/ping-javascript-sdk.git",
+    "directory": "packages/sdk-effects/store"
+  },
+  "description": "Shared Redux store and OpenID Connect discovery API for the Ping JavaScript SDK",
+  "license": "MIT",
+  "author": "ForgeRock",
+  "sideEffects": false,
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/src/index.d.ts",
+      "import": "./dist/src/index.js",
+      "default": "./dist/src/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "./dist/src/index.js",
+  "module": "./dist/src/index.js",
+  "types": "./dist/src/index.d.ts",
+  "files": ["dist"],
+  "scripts": {
+    "build": "pnpm nx nxBuild",
+    "lint": "pnpm nx nxLint",
+    "test": "pnpm nx nxTest",
+    "test:watch": "pnpm nx nxTest --watch"
+  },
+  "dependencies": {
+    "@forgerock/sdk-types": "workspace:*",
+    "@reduxjs/toolkit": "catalog:"
+  },
+  "nx": {
+    "tags": ["scope:sdk-effects"]
+  }
+}
diff --git a/packages/sdk-effects/store/src/index.ts b/packages/sdk-effects/store/src/index.ts
new file mode 100644
index 00000000000..2792f317a15
--- /dev/null
+++ b/packages/sdk-effects/store/src/index.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+export { wellknownApi, wellknownSelector } from './lib/wellknown.api.js';
+export type { WellknownState } from './lib/wellknown.api.js';
+
+export { initWellknownQuery, isValidWellknownResponse } from './lib/wellknown.effects.js';
+
+export { clientExtra } from './lib/store.utils.js';
+
+export {
+  createSdkStore,
+  injectClient,
+  isSdkStoreHandle,
+  INVALID_STORE_MESSAGE,
+  assertValidStore,
+  getClientForReducerPath,
+} from './lib/store.effects.js';
+export type {
+  ClientSlot,
+  InjectClientOptions,
+  SdkStore,
+  SdkStoreHandle,
+  SdkStoreRegistry,
+} from './lib/store.types.js';
diff --git a/packages/sdk-effects/store/src/lib/store.effects.test.ts b/packages/sdk-effects/store/src/lib/store.effects.test.ts
new file mode 100644
index 00000000000..a5de9b56b3e
--- /dev/null
+++ b/packages/sdk-effects/store/src/lib/store.effects.test.ts
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { createSlice } from '@reduxjs/toolkit';
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query';
+import { describe, expect, it, vi } from 'vitest';
+
+import { createSdkStore, injectClient, isSdkStoreHandle } from './store.effects.js';
+import { wellknownApi } from './wellknown.api.js';
+
+const fakeApi = createApi({
+  reducerPath: 'fake',
+  baseQuery: fetchBaseQuery(),
+  endpoints: (builder) => ({
+    ping: builder.query<object, void>({ queryFn: async () => ({ data: {} }) }),
+  }),
+});
+
+const otherApi = createApi({
+  reducerPath: 'other',
+  baseQuery: fetchBaseQuery(),
+  endpoints: (builder) => ({
+    ping: builder.query<object, void>({ queryFn: async () => ({ data: {} }) }),
+  }),
+});
+
+const fakeSlice = createSlice({
+  name: 'fakeSlice',
+  initialState: { value: 0 },
+  reducers: { bump: (state) => ({ value: state.value + 1 }) },
+});
+
+/** Stand-in for a request middleware; sdk-store does not depend on its type. */
+function noopMiddleware() {
+  return (_req: unknown, _action: unknown, next: () => unknown) => {
+    next();
+  };
+}
+
+describe('createSdkStore', () => {
+  it('produces a handle that satisfies the shared contract', () => {
+    // Act
+    const handle = createSdkStore();
+
+    // Assert
+    expect(isSdkStoreHandle(handle)).toBe(true);
+  });
+
+  it('mounts the wellknown slice so discovery is shared from the start', () => {
+    // Act
+    const handle = createSdkStore();
+
+    // Assert
+    expect(Object.keys(handle.store.getState() as object)).toContain(wellknownApi.reducerPath);
+  });
+
+  it('starts with an empty client registry on the store extra', () => {
+    // Act
+    const handle = createSdkStore();
+
+    // Assert
+    expect(handle.extra.clients).toEqual({});
+  });
+
+  it('returns an independent store on each call', () => {
+    // Act
+    const a = createSdkStore();
+    const b = createSdkStore();
+
+    // Assert
+    expect(a.store).not.toBe(b.store);
+    expect(a.extra).not.toBe(b.extra);
+  });
+});
+
+describe('isSdkStoreHandle', () => {
+  it.each([
+    ['undefined', undefined],
+    ['null', null],
+    ['a number', 42],
+    ['a string', 'store'],
+    ['an empty object', {}],
+    [
+      'an object missing dynamicMiddleware',
+      { store: {}, rootReducer: { inject: () => undefined } },
+    ],
+    ['a bare redux store', { dispatch: () => undefined, getState: () => ({}) }],
+  ])('rejects %s', (_label, candidate) => {
+    // Assert — a bad handle must be detectable before we mutate anything
+    expect(isSdkStoreHandle(candidate)).toBe(false);
+  });
+
+  it('accepts a real handle', () => {
+    expect(isSdkStoreHandle(createSdkStore())).toBe(true);
+  });
+});
+
+describe('injectClient', () => {
+  it('mounts the client api reducer and makes it readable immediately', () => {
+    // Arrange
+    const handle = createSdkStore();
+
+    // Act
+    injectClient(handle, { api: fakeApi, reducerPath: fakeApi.reducerPath });
+
+    // Assert — no manual dispatch required by the caller
+    expect(Object.keys(handle.store.getState() as object)).toContain('fake');
+  });
+
+  it('mounts additional slices supplied by the client', () => {
+    // Arrange
+    const handle = createSdkStore();
+
+    // Act
+    injectClient(handle, {
+      api: fakeApi,
+      reducerPath: fakeApi.reducerPath,
+      slices: [fakeSlice],
+    });
+
+    // Assert
+    expect(Object.keys(handle.store.getState() as object)).toContain('fakeSlice');
+  });
+
+  it('registers the client slot under its reducerPath', () => {
+    // Arrange
+    const handle = createSdkStore();
+    const mw = noopMiddleware();
+
+    // Act
+    injectClient(handle, {
+      api: fakeApi,
+      reducerPath: fakeApi.reducerPath,
+      requestMiddleware: [mw],
+    });
+
+    // Assert
+    expect(handle.extra.clients['fake']?.requestMiddleware).toEqual([mw]);
+  });
+
+  it('keeps each client slot separate', () => {
+    // Arrange
+    const handle = createSdkStore();
+    const first = noopMiddleware();
+    const second = noopMiddleware();
+
+    // Act
+    injectClient(handle, {
+      api: fakeApi,
+      reducerPath: fakeApi.reducerPath,
+      requestMiddleware: [first],
+    });
+    injectClient(handle, {
+      api: otherApi,
+      reducerPath: otherApi.reducerPath,
+      requestMiddleware: [second],
+    });
+
+    // Assert
+    expect(handle.extra.clients['fake']?.requestMiddleware).toEqual([first]);
+    expect(handle.extra.clients['other']?.requestMiddleware).toEqual([second]);
+  });
+
+  it('adds the api middleware to the dynamic chain', () => {
+    // Arrange
+    const handle = createSdkStore();
+    const spy = vi.spyOn(handle.dynamicMiddleware, 'addMiddleware');
+
+    // Act
+    injectClient(handle, { api: fakeApi, reducerPath: fakeApi.reducerPath });
+
+    // Assert
+    expect(spy).toHaveBeenCalledWith(fakeApi.middleware);
+  });
+
+  it('is idempotent for repeated injection of the same client', () => {
+    // Arrange
+    const handle = createSdkStore();
+    const spy = vi.spyOn(handle.dynamicMiddleware, 'addMiddleware');
+
+    // Act
+    injectClient(handle, { api: fakeApi, reducerPath: fakeApi.reducerPath });
+    const afterFirst = Object.keys(handle.store.getState() as object).sort();
+    injectClient(handle, { api: fakeApi, reducerPath: fakeApi.reducerPath });
+
+    // Assert
+    expect(Object.keys(handle.store.getState() as object).sort()).toEqual(afterFirst);
+    expect(spy).toHaveBeenCalledTimes(1); // middleware must not be double-registered
+  });
+
+  it('throws a descriptive error when handed something that is not a handle', () => {
+    // Assert — better than a TypeError from deep inside a factory
+    expect(() =>
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      injectClient({} as any, { api: fakeApi, reducerPath: fakeApi.reducerPath }),
+    ).toThrow(/not a valid SDK store/i);
+  });
+});
diff --git a/packages/sdk-effects/store/src/lib/store.effects.ts b/packages/sdk-effects/store/src/lib/store.effects.ts
new file mode 100644
index 00000000000..28b30528e13
--- /dev/null
+++ b/packages/sdk-effects/store/src/lib/store.effects.ts
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { combineSlices, configureStore, createDynamicMiddleware } from '@reduxjs/toolkit';
+
+import { wellknownApi } from './wellknown.api.js';
+
+import type {
+  InjectClientOptions,
+  SdkStore,
+  SdkStoreHandle,
+  SdkStoreRegistry,
+} from './store.types.js';
+
+/**
+ * Dispatched after a slice injection to force `combineSlices` to recompute.
+ *
+ * `inject()` registers the reducer but does not itself recalculate state, so
+ * without this a caller reading `getState()` straight after injection would not
+ * see its own slice. Doing it here means no client has to know that.
+ */
+const RECOMPUTE_ACTION = { type: '@@sdk-store/recompute' } as const;
+
+/**
+ * Creates a Redux store that SDK clients can share.
+ *
+ * Only the well-known discovery slice is mounted up front — that is the one
+ * piece every client needs, and mounting it once is what makes the discovery
+ * document fetch exactly once per URL no matter how many clients attach.
+ * Everything else arrives through {@link injectClient}.
+ *
+ * Applications may call this directly to own the store themselves, but they do
+ * not have to: each client factory creates one on demand when none is passed.
+ */
+export function createSdkStore(): SdkStore {
+  const dynamicMiddleware = createDynamicMiddleware();
+  const rootReducer = combineSlices(wellknownApi).withLazyLoadedSlices();
+
+  // Captured by reference so slots registered later are visible to every request.
+  const extra: SdkStoreRegistry = { clients: {} };
+
+  const store = configureStore({
+    reducer: rootReducer,
+    middleware: (getDefaultMiddleware) =>
+      getDefaultMiddleware({ thunk: { extraArgument: extra } })
+        .concat(wellknownApi.middleware)
+        .concat(dynamicMiddleware.middleware),
+  });
+
+  return {
+    store,
+    rootReducer,
+    dynamicMiddleware,
+    extra,
+  } as unknown as SdkStore;
+}
+
+/**
+ * Human-readable explanation used whenever an argument fails the
+ * {@link isSdkStoreHandle} check.
+ *
+ * Exported so client packages can reference the same string rather than
+ * duplicating it.
+ */
+export const INVALID_STORE_MESSAGE =
+  'The provided `store` is not a valid SDK store. Pass the `store` returned by ' +
+  'another SDK client, or one created with `createSdkStore()`.';
+
+/**
+ * Narrows an unknown value to a usable store handle.
+ *
+ * Client factories accept a store from application code, so the value cannot be
+ * trusted. Checking it here turns a bad argument into a clear error instead of a
+ * `TypeError` raised somewhere inside RTK.
+ */
+export function isSdkStoreHandle(value: unknown): value is SdkStore {
+  if (typeof value !== 'object' || value === null) {
+    return false;
+  }
+
+  const candidate = value as Partial<SdkStoreHandle>;
+
+  return (
+    typeof candidate.store === 'object' &&
+    candidate.store !== null &&
+    typeof candidate.store.dispatch === 'function' &&
+    typeof candidate.store.getState === 'function' &&
+    typeof candidate.rootReducer === 'function' &&
+    typeof candidate.rootReducer.inject === 'function' &&
+    typeof candidate.dynamicMiddleware === 'object' &&
+    candidate.dynamicMiddleware !== null &&
+    typeof candidate.dynamicMiddleware.addMiddleware === 'function' &&
+    typeof candidate.extra === 'object' &&
+    candidate.extra !== null &&
+    typeof candidate.extra.clients === 'object'
+  );
+}
+
+/**
+ * Validates that `store` is either `undefined` or a valid {@link SdkStore}.
+ * Returns `undefined` on success, or a `GenericError` describing the failure.
+ *
+ * Using this in factory functions avoids duplicating the
+ * `isSdkStoreHandle` guard + `INVALID_STORE_MESSAGE` string in every package.
+ */
+export function assertValidStore(
+  store: unknown,
+): { error: string; type: 'argument_error' } | undefined {
+  if (store !== undefined && !isSdkStoreHandle(store)) {
+    return { error: INVALID_STORE_MESSAGE, type: 'argument_error' };
+  }
+  return undefined;
+}
+
+/**
+ * Returns the registered client slot for a given reducer path, or `undefined`.
+ * Use this instead of reaching into `store.extra.clients` directly.
+ */
+export function getClientForReducerPath(
+  store: SdkStore,
+  reducerPath: string,
+): { clientId?: string } | undefined {
+  return store.extra.clients[reducerPath] as { clientId?: string } | undefined;
+}
+
+/**
+ * Attaches a client to a store: mounts its reducers and middleware, and
+ * registers its private slot on the store's client registry.
+ *
+ * Safe to call more than once for the same client — RTK deduplicates reducer
+ * injection, and re-registering a slot simply overwrites it with equal values.
+ *
+ * @throws If `handle` is not a valid SDK store handle.
+ */
+export function injectClient<S extends object = Record<string, unknown>>(
+  handle: SdkStore,
+  options: InjectClientOptions,
+): SdkStoreHandle<S> {
+  if (!isSdkStoreHandle(handle)) {
+    throw new Error(INVALID_STORE_MESSAGE);
+  }
+
+  const { api, reducerPath, slices = [], requestMiddleware, logger, clientId } = options;
+
+  const inject = handle.rootReducer.inject as (slice: unknown) => unknown;
+  inject(api);
+  for (const slice of slices) {
+    inject(slice);
+  }
+
+  const addMiddleware = handle.dynamicMiddleware.addMiddleware as (mw: unknown) => unknown;
+  const alreadyInjected = reducerPath in (handle.extra.clients as Record<string, unknown>);
+  if (!alreadyInjected) {
+    addMiddleware(api.middleware);
+  }
+
+  // The registry is readonly to consumers but mutable here by design: this is
+  // the only place a slot is created, and it must work on a store built earlier.
+  (handle.extra.clients as Record<string, unknown>)[reducerPath] = {
+    requestMiddleware,
+    logger,
+    clientId,
+  };
+
+  handle.store.dispatch(RECOMPUTE_ACTION as never);
+
+  /**
+   * The only widening in the shared-store path, and it is unavoidable:
+   * TypeScript cannot compute a state shape that is assembled by successive
+   * lazy `inject()` calls. The caller states the shape its own slices produce,
+   * and it is correct by construction because those slices were just injected
+   * above. Keeping it here means no client package needs a cast of its own.
+   */
+  return handle as unknown as SdkStoreHandle<S>;
+}
diff --git a/packages/sdk-effects/store/src/lib/store.types.ts b/packages/sdk-effects/store/src/lib/store.types.ts
new file mode 100644
index 00000000000..d4b87637f61
--- /dev/null
+++ b/packages/sdk-effects/store/src/lib/store.types.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import type { Middleware, Reducer, Store, ThunkDispatch, UnknownAction } from '@reduxjs/toolkit';
+
+/**
+ * Per-client slot on a store's thunk `extraArgument`.
+ *
+ * The fields are intentionally loose: `sdk-store` sits in the effects layer
+ * alongside `sdk-request-middleware` and `sdk-logger`, so it cannot depend on
+ * their types without crossing a module boundary. Each client narrows this to
+ * its own concrete shape at the point of use.
+ */
+export interface ClientSlot {
+  readonly requestMiddleware?: readonly unknown[];
+  readonly logger?: unknown;
+  /**
+   * Identifies which client instance owns this slot, so a second client can be
+   * detected before it silently shares the first one's cache slice.
+   */
+  readonly clientId?: string;
+}
+
+/**
+ * The mutable client registry carried as the store's `extraArgument`.
+ *
+ * `configureStore` captures this object by reference, so slots added after the
+ * store is built are visible to every subsequent request. That is what allows a
+ * second client to attach itself to a store it did not create.
+ */
+export interface SdkStoreRegistry {
+  readonly clients: Record<string, ClientSlot>;
+}
+
+/** A reducer that supports lazy slice injection, as produced by `combineSlices`. */
+export interface InjectableRootReducer {
+  inject: (slice: never) => unknown;
+}
+
+/** Middleware chain that accepts additions after the store is created. */
+export interface DynamicMiddleware {
+  addMiddleware: (...middleware: never[]) => unknown;
+}
+
+/**
+ * A shared SDK Redux store, independent of the state shape.
+ *
+ * This is the single declaration of the contract between client packages, and
+ * the type that travels between them: `davinci()` and `journey()` expose one,
+ * `oidc()` accepts one. It is deliberately state-agnostic so a handle typed
+ * with DaVinci's state is assignable to it without a cast — which is what lets
+ * the whole path stay cast-free.
+ *
+ * An earlier design used a branded interface whose brand existed on no runtime
+ * object. That forced `as unknown as` on both sides — four unchecked casts to
+ * move one object across a package boundary, with no compile-time link between
+ * producer and consumer. A structural type gives real checking instead.
+ */
+export interface SdkStore {
+  readonly store: {
+    getState: () => unknown;
+    /** `never` parameter keeps any concrete dispatch assignable to this. */
+    dispatch: (action: never) => unknown;
+    subscribe: (listener: () => void) => () => void;
+  };
+  readonly rootReducer: InjectableRootReducer;
+  readonly dynamicMiddleware: DynamicMiddleware;
+  readonly extra: SdkStoreRegistry;
+}
+
+/**
+ * A store handle with a known state shape.
+ *
+ * Returned by each client's own store factory so that internal code gets full
+ * typing on `getState()` and `dispatch()`. Assignable to {@link SdkStore} for
+ * hand-off to another client.
+ */
+export interface SdkStoreHandle<S extends object = Record<string, unknown>> extends SdkStore {
+  /**
+   * `dispatch` keeps RTK's thunk typing so clients can await the result of
+   * `endpoint.initiate(...)` exactly as they would on a store they built
+   * themselves.
+   */
+  readonly store: Store<S, UnknownAction> & {
+    dispatch: ThunkDispatch<S, SdkStoreRegistry, UnknownAction>;
+  };
+  readonly rootReducer: InjectableRootReducer & Reducer<S>;
+}
+
+/** Options describing the client attaching itself to a store. */
+export interface InjectClientOptions {
+  /** The client's RTK Query api. Its reducer and middleware are both mounted. */
+  readonly api: { reducerPath: string; reducer: Reducer; middleware: Middleware };
+  /** Key for this client's slot on the registry. Normally `api.reducerPath`. */
+  readonly reducerPath: string;
+  /** Additional slices the client owns, e.g. its config and node slices. */
+  readonly slices?: readonly { name: string; reducer: Reducer }[];
+  readonly requestMiddleware?: readonly unknown[];
+  readonly logger?: unknown;
+  /** Recorded on the slot so repeat injections can be distinguished. */
+  readonly clientId?: string;
+}
diff --git a/packages/sdk-effects/store/src/lib/store.utils.test.ts b/packages/sdk-effects/store/src/lib/store.utils.test.ts
new file mode 100644
index 00000000000..2b5266c595f
--- /dev/null
+++ b/packages/sdk-effects/store/src/lib/store.utils.test.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { describe, expect, it } from 'vitest';
+
+import { clientExtra } from './store.utils.js';
+
+interface TestExtra {
+  requestMiddleware?: string[];
+  logger?: string;
+}
+
+describe('clientExtra', () => {
+  it('returns the slot registered for the requested reducerPath', () => {
+    // Arrange
+    const extra = {
+      clients: {
+        oidc: { requestMiddleware: ['oidc-mw'], logger: 'oidc-logger' },
+        davinci: { requestMiddleware: ['davinci-mw'], logger: 'davinci-logger' },
+      },
+    };
+
+    // Act
+    const result = clientExtra<TestExtra>(extra, 'oidc');
+
+    // Assert
+    expect(result).toEqual({ requestMiddleware: ['oidc-mw'], logger: 'oidc-logger' });
+  });
+
+  it('never returns another client slot', () => {
+    // Arrange — this is the §1.1 leak, expressed as a unit property
+    const extra = {
+      clients: {
+        davinci: { requestMiddleware: ['davinci-mw'], logger: 'davinci-logger' },
+      },
+    };
+
+    // Act
+    const result = clientExtra<TestExtra>(extra, 'oidc');
+
+    // Assert
+    expect(result.requestMiddleware).toBeUndefined();
+    expect(result.logger).toBeUndefined();
+  });
+
+  it('returns an empty slot for an unregistered reducerPath', () => {
+    // Arrange
+    const extra = { clients: {} };
+
+    // Act
+    const result = clientExtra<TestExtra>(extra, 'oidc');
+
+    // Assert
+    expect(result).toEqual({});
+  });
+
+  it.each([
+    ['undefined', undefined],
+    ['null', null],
+    ['a non-object', 42],
+    ['an object without a clients key', { requestMiddleware: ['legacy'] }],
+    ['an object whose clients value is not an object', { clients: 'nope' }],
+  ])('returns an empty slot when extra is %s', (_label, extra) => {
+    // Act
+    const result = clientExtra<TestExtra>(extra, 'oidc');
+
+    // Assert — must never throw; endpoints call this on every request
+    expect(result).toEqual({});
+  });
+
+  it('does not expose the registry itself', () => {
+    // Arrange
+    const slot = { requestMiddleware: ['oidc-mw'] };
+    const extra = { clients: { oidc: slot } };
+
+    // Act
+    const result = clientExtra<TestExtra>(extra, 'oidc');
+
+    // Assert
+    expect(result).toBe(slot);
+    expect(result).not.toHaveProperty('clients');
+  });
+});
diff --git a/packages/sdk-effects/store/src/lib/store.utils.ts b/packages/sdk-effects/store/src/lib/store.utils.ts
new file mode 100644
index 00000000000..1cced6851d3
--- /dev/null
+++ b/packages/sdk-effects/store/src/lib/store.utils.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+/**
+ * Resolves the calling client's own slot from a store's `extraArgument`.
+ *
+ * This runs on every request, so it never throws. An unrecognised or malformed
+ * `extra` yields the provided `defaults` (or an empty object) rather than an
+ * error — and, critically, never falls back to a store-wide value that would
+ * belong to a different client.
+ *
+ * When `defaults` are supplied, any slot key that is absent or `undefined` is
+ * filled in from `defaults`, letting callers express their fallback values once
+ * at the call site instead of with repeated `?? x` expressions.
+ *
+ * @param extra - The thunk `extraArgument`, as received from `api.extra`
+ * @param reducerPath - The calling api's `reducerPath`, used as the slot key
+ * @param defaults - Optional fallback values for missing or undefined slot fields
+ * @returns The client's own slot merged with defaults, or just defaults / {} if no slot is registered
+ */
+export function clientExtra<Slot extends object>(
+  extra: unknown,
+  reducerPath: string,
+  defaults?: Partial<Slot>,
+): Slot {
+  const fallback = (defaults ?? {}) as Slot;
+
+  if (typeof extra !== 'object' || extra === null || !('clients' in extra)) {
+    return fallback;
+  }
+
+  const { clients } = extra as { clients: unknown };
+  if (typeof clients !== 'object' || clients === null) {
+    return fallback;
+  }
+
+  const slot = (clients as Record<string, unknown>)[reducerPath];
+  if (typeof slot !== 'object' || slot === null) {
+    return fallback;
+  }
+
+  if (defaults === undefined) {
+    return slot as Slot;
+  }
+
+  // Merge: defaults fill in any key that is absent or undefined in the slot.
+  const merged = { ...slot } as Record<string, unknown>;
+  for (const [key, value] of Object.entries(defaults as Record<string, unknown>)) {
+    if (merged[key] === undefined) {
+      merged[key] = value;
+    }
+  }
+  return merged as Slot;
+}
diff --git a/packages/sdk-effects/store/src/lib/wellknown.api.test.ts b/packages/sdk-effects/store/src/lib/wellknown.api.test.ts
new file mode 100644
index 00000000000..cd126216f5e
--- /dev/null
+++ b/packages/sdk-effects/store/src/lib/wellknown.api.test.ts
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { configureStore } from '@reduxjs/toolkit';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { createWellknownSelector, wellknownApi, wellknownSelector } from './wellknown.api.js';
+
+import type { WellknownResponse } from '@forgerock/sdk-types';
+
+const URL_A = 'https://a.example.com/as/.well-known/openid-configuration';
+const URL_B = 'https://b.example.com/as/.well-known/openid-configuration';
+
+function wellknownFixture(overrides: Partial<WellknownResponse> = {}) {
+  return {
+    issuer: 'https://a.example.com/as',
+    authorization_endpoint: 'https://a.example.com/as/authorize',
+    token_endpoint: 'https://a.example.com/as/token',
+    userinfo_endpoint: 'https://a.example.com/as/userinfo',
+    jwks_uri: 'https://a.example.com/as/jwks',
+    ...overrides,
+  };
+}
+
+function makeStore() {
+  return configureStore({
+    reducer: { [wellknownApi.reducerPath]: wellknownApi.reducer },
+    middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(wellknownApi.middleware),
+  });
+}
+
+function jsonResponse(body: unknown, status = 200) {
+  return new Response(JSON.stringify(body), {
+    status,
+    headers: { 'Content-Type': 'application/json' },
+  });
+}
+
+describe('wellknownApi', () => {
+  let fetchSpy: ReturnType<typeof vi.spyOn>;
+  let calledUrls: string[];
+
+  beforeEach(() => {
+    calledUrls = [];
+    fetchSpy = vi.spyOn(globalThis, 'fetch').mockImplementation(async (input) => {
+      const url = typeof input === 'string' ? input : (input as Request).url;
+      calledUrls.push(url);
+      return jsonResponse(wellknownFixture());
+    }) as ReturnType<typeof vi.spyOn>;
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+    wellknownApi.util.resetApiState();
+  });
+
+  it('fetches the configuration exactly once for a single URL', async () => {
+    // Arrange
+    const store = makeStore();
+
+    // Act
+    const result = await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+
+    // Assert
+    expect(result.data).toMatchObject({ issuer: 'https://a.example.com/as' });
+    expect(calledUrls).toHaveLength(1);
+  });
+
+  it('serves the second identical request from cache without a second network call', async () => {
+    // Arrange
+    const store = makeStore();
+
+    // Act
+    await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+    await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+
+    // Assert — this is the property the shared store depends on
+    expect(calledUrls).toEqual([URL_A]);
+  });
+
+  it('keeps a separate cache entry per URL', async () => {
+    // Arrange
+    const store = makeStore();
+
+    // Act
+    await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+    await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_B));
+
+    // Assert
+    expect(calledUrls).toEqual([URL_A, URL_B]);
+    expect(wellknownSelector(URL_A, store.getState())).toBeDefined();
+    expect(wellknownSelector(URL_B, store.getState())).toBeDefined();
+  });
+
+  it('maps a non-2xx response to an error rather than throwing', async () => {
+    // Arrange
+    fetchSpy.mockImplementation(async () => jsonResponse({ message: 'nope' }, 500));
+    const store = makeStore();
+
+    // Act
+    const result = await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+
+    // Assert
+    expect(result.error).toBeDefined();
+    expect(result.data).toBeUndefined();
+  });
+
+  it('maps a structurally invalid well-known payload to an error', async () => {
+    // Arrange — missing issuer/authorization_endpoint/token_endpoint
+    fetchSpy.mockImplementation(async () =>
+      jsonResponse({ jwks_uri: 'https://a.example.com/jwks' }),
+    );
+    const store = makeStore();
+
+    // Act
+    const result = await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+
+    // Assert
+    expect(result.error).toBeDefined();
+    expect(result.data).toBeUndefined();
+  });
+
+  it('maps a network rejection to an error rather than throwing', async () => {
+    // Arrange
+    fetchSpy.mockImplementation(async () => {
+      throw new Error('connection refused');
+    });
+    const store = makeStore();
+
+    // Act
+    const result = await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+
+    // Assert
+    expect(result.error).toBeDefined();
+    expect(result.data).toBeUndefined();
+  });
+});
+
+describe('createWellknownSelector', () => {
+  it('returns the same selector instance for the same URL', () => {
+    // Arrange / Act
+    const first = createWellknownSelector(URL_A);
+    const second = createWellknownSelector(URL_A);
+
+    // Assert — without this, memoization is rebuilt on every call and never hits
+    expect(first).toBe(second);
+  });
+
+  it('returns distinct selector instances for distinct URLs', () => {
+    // Arrange / Act
+    const a = createWellknownSelector(URL_A);
+    const b = createWellknownSelector(URL_B);
+
+    // Assert
+    expect(a).not.toBe(b);
+  });
+
+  it('does not recompute when called repeatedly against unchanged state', async () => {
+    // Arrange
+    vi.spyOn(globalThis, 'fetch').mockImplementation(async () => jsonResponse(wellknownFixture()));
+    const store = makeStore();
+    await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+    const selector = createWellknownSelector(URL_A);
+
+    // Act
+    selector(store.getState());
+    const afterFirst = selector.recomputations();
+    selector(store.getState());
+    selector(store.getState());
+
+    // Assert
+    expect(selector.recomputations()).toBe(afterFirst);
+
+    vi.restoreAllMocks();
+    wellknownApi.util.resetApiState();
+  });
+});
+
+describe('wellknownSelector', () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    wellknownApi.util.resetApiState();
+  });
+
+  it('returns undefined before the configuration has been fetched', () => {
+    // Arrange
+    const store = makeStore();
+
+    // Act / Assert
+    expect(wellknownSelector(URL_A, store.getState())).toBeUndefined();
+  });
+
+  it('returns the cached configuration after a successful fetch', async () => {
+    // Arrange
+    vi.spyOn(globalThis, 'fetch').mockImplementation(async () => jsonResponse(wellknownFixture()));
+    const store = makeStore();
+
+    // Act
+    await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+
+    // Assert
+    expect(wellknownSelector(URL_A, store.getState())).toMatchObject({
+      issuer: 'https://a.example.com/as',
+    });
+  });
+
+  it('returns undefined when the fetch failed', async () => {
+    // Arrange
+    vi.spyOn(globalThis, 'fetch').mockImplementation(async () => jsonResponse({}, 500));
+    const store = makeStore();
+
+    // Act
+    await store.dispatch(wellknownApi.endpoints.configuration.initiate(URL_A));
+
+    // Assert
+    expect(wellknownSelector(URL_A, store.getState())).toBeUndefined();
+  });
+});
diff --git a/packages/oidc-client/src/lib/wellknown.api.ts b/packages/sdk-effects/store/src/lib/wellknown.api.ts
similarity index 54%
rename from packages/oidc-client/src/lib/wellknown.api.ts
rename to packages/sdk-effects/store/src/lib/wellknown.api.ts
index ddcd254d4d1..8a3c6a8e978 100644
--- a/packages/oidc-client/src/lib/wellknown.api.ts
+++ b/packages/sdk-effects/store/src/lib/wellknown.api.ts
@@ -7,7 +7,7 @@
 
 import { createSelector } from '@reduxjs/toolkit';
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query';
-import { initWellknownQuery } from '@forgerock/sdk-oidc';
+import { initWellknownQuery } from './wellknown.effects.js';
 
 import type { WellknownResponse } from '@forgerock/sdk-types';
 import type {
@@ -15,14 +15,16 @@ import type {
   FetchBaseQueryMeta,
   QueryReturnValue,
 } from '@reduxjs/toolkit/query';
-import type { RootState } from './client.types.js';
 
 /**
  * RTK Query API for well-known endpoint discovery.
  *
- * Uses the `initWellknownQuery` builder pattern from `@forgerock/sdk-oidc`.
+ * Uses the `initWellknownQuery` builder pattern from `./wellknown.effects.js`.
  * The builder constructs the request and validates the response;
  * `fetchBaseQuery` handles the HTTP transport through RTK Query's pipeline.
+ *
+ * This is the canonical single instance — all SDK client packages import from here
+ * so that a shared Redux store gets a single cache entry per URL.
  */
 export const wellknownApi = createApi({
   reducerPath: 'wellknown',
@@ -44,33 +46,64 @@ export const wellknownApi = createApi({
   }),
 });
 
+/** Minimum state shape required to use wellknown selectors. */
+export type WellknownState = {
+  [wellknownApi.reducerPath]: ReturnType<typeof wellknownApi.reducer>;
+};
+
+/**
+ * Per-URL selector cache.
+ *
+ * `createSelector` memoizes against its inputs, so a fresh instance per call
+ * would start with a cold cache every time and never hit. Keying instances by
+ * URL is what makes the memoization actually effective. This is a pure cache:
+ * the same URL always yields the same selector, and it is unobservable from
+ * outside beyond that identity.
+ */
+const selectorCache = new Map<string, WellknownStateSelector>();
+
+type WellknownStateSelector = ReturnType<
+  typeof createSelector<
+    [ReturnType<typeof wellknownApi.endpoints.configuration.select>],
+    WellknownResponse | undefined
+  >
+>;
+
 /**
  * Creates a memoized selector for cached well-known data.
  *
+ * Repeated calls with the same URL return the *same* selector instance, so the
+ * memoization is shared across every call site.
+ *
  * @param wellknownUrl - The well-known endpoint URL used as the cache key
  * @returns A memoized selector that extracts the WellknownResponse from state, or undefined if not yet fetched
  */
-export function createWellknownSelector(wellknownUrl: string) {
-  return createSelector(
+export function createWellknownSelector(wellknownUrl: string): WellknownStateSelector {
+  const cached = selectorCache.get(wellknownUrl);
+  if (cached) {
+    return cached;
+  }
+
+  const selector = createSelector(
     wellknownApi.endpoints.configuration.select(wellknownUrl),
     (result) => result?.data,
-  );
+  ) as WellknownStateSelector;
+
+  selectorCache.set(wellknownUrl, selector);
+  return selector;
 }
 
 /**
- * Convenience selector for oidc-client's RootState type.
+ * Convenience selector for any state that contains the wellknown slice.
  *
  * Unlike {@link createWellknownSelector}, this immediately evaluates the
  * selector against the provided state rather than returning a reusable selector.
  *
  * @param wellknownUrl - The well-known endpoint URL used as the cache key
- * @param state - The oidc-client Redux root state
+ * @param state - Any Redux state that includes the wellknown slice
  * @returns The cached WellknownResponse or undefined if not yet fetched
  */
-export function wellknownSelector(wellknownUrl: string, state: RootState) {
-  const selector = createSelector(
-    wellknownApi.endpoints.configuration.select(wellknownUrl),
-    (result) => result?.data,
-  );
+export function wellknownSelector<S extends WellknownState>(wellknownUrl: string, state: S) {
+  const selector = createWellknownSelector(wellknownUrl);
   return selector(state);
 }
diff --git a/packages/sdk-effects/oidc/src/lib/wellknown.effects.test.ts b/packages/sdk-effects/store/src/lib/wellknown.effects.test.ts
similarity index 98%
rename from packages/sdk-effects/oidc/src/lib/wellknown.effects.test.ts
rename to packages/sdk-effects/store/src/lib/wellknown.effects.test.ts
index cbf7033e30a..ab62f71017f 100644
--- a/packages/sdk-effects/oidc/src/lib/wellknown.effects.test.ts
+++ b/packages/sdk-effects/store/src/lib/wellknown.effects.test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
  *
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
diff --git a/packages/sdk-effects/oidc/src/lib/wellknown.effects.ts b/packages/sdk-effects/store/src/lib/wellknown.effects.ts
similarity index 98%
rename from packages/sdk-effects/oidc/src/lib/wellknown.effects.ts
rename to packages/sdk-effects/store/src/lib/wellknown.effects.ts
index 3836173422d..f58c36c6255 100644
--- a/packages/sdk-effects/oidc/src/lib/wellknown.effects.ts
+++ b/packages/sdk-effects/store/src/lib/wellknown.effects.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.
+ * Copyright (c) 2025 - 2026 Ping Identity Corporation. All rights reserved.
  *
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
diff --git a/packages/sdk-effects/store/tsconfig.json b/packages/sdk-effects/store/tsconfig.json
new file mode 100644
index 00000000000..3a5af05d8ed
--- /dev/null
+++ b/packages/sdk-effects/store/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ],
+  "nx": {
+    "addTypecheckTarget": false
+  }
+}
diff --git a/packages/sdk-effects/store/tsconfig.lib.json b/packages/sdk-effects/store/tsconfig.lib.json
new file mode 100644
index 00000000000..79c8dd79770
--- /dev/null
+++ b/packages/sdk-effects/store/tsconfig.lib.json
@@ -0,0 +1,34 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
+    "emitDeclarationOnly": false,
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "importHelpers": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "references": [{ "path": "../../sdk-types/tsconfig.lib.json" }],
+  "exclude": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx"
+  ]
+}
diff --git a/packages/sdk-effects/store/tsconfig.spec.json b/packages/sdk-effects/store/tsconfig.spec.json
new file mode 100644
index 00000000000..c8fc6b21fa7
--- /dev/null
+++ b/packages/sdk-effects/store/tsconfig.spec.json
@@ -0,0 +1,41 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ],
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "importHelpers": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": [
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/sdk-effects/store/vite.config.ts b/packages/sdk-effects/store/vite.config.ts
new file mode 100644
index 00000000000..57986fd5eae
--- /dev/null
+++ b/packages/sdk-effects/store/vite.config.ts
@@ -0,0 +1,43 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../../node_modules/.vite/packages/sdk-effects/store',
+  plugins: [],
+  test: {
+    watch: false,
+    globals: true,
+    environment: 'node',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      include: ['src/**/*.{js,ts}'],
+      exclude: [
+        'src/**/*.mock.{js,ts}',
+        'src/**/*.data.{js,ts}',
+        'src/**/*.test.{js,ts}',
+        'coverage/**',
+        'dist/**',
+        '**/node_modules/**',
+        '**/[.]**',
+        'packages/*/test?(s)/**',
+        '**/*.d.ts',
+        '**/virtual:*',
+        '**/__x00__*',
+        '**/ *',
+        'cypress/**',
+        'test?(s)/**',
+        'test?(-*).?(c|m)[jt]s?(x)',
+        '**/*{.,-}{test,spec,bench,benchmark}?(-d).?(c|m)[jt]s?(x)',
+        '**/__tests__/**',
+        '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build,eslint,prettier}.config.*',
+        '**/vitest.{workspace,projects}.[jt]s?(on)',
+        '**/.{eslint,mocha,prettier}rc.{?(c|m)js,yml}',
+      ],
+      reporter: ['text', 'html', 'json'],
+      enabled: Boolean(process.env['CI']),
+      reportsDirectory: './coverage',
+      provider: 'v8' as const,
+    },
+  },
+}));
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ae4c0b1fffc..a80963cba9a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -457,6 +457,9 @@ importers:
       '@forgerock/sdk-request-middleware':
         specifier: workspace:*
         version: link:../sdk-effects/sdk-request-middleware
+      '@forgerock/sdk-store':
+        specifier: workspace:*
+        version: link:../sdk-effects/store
       '@forgerock/sdk-types':
         specifier: workspace:*
         version: link:../sdk-types
@@ -507,12 +510,12 @@ importers:
       '@forgerock/sdk-logger':
         specifier: workspace:*
         version: link:../sdk-effects/logger
-      '@forgerock/sdk-oidc':
-        specifier: workspace:*
-        version: link:../sdk-effects/oidc
       '@forgerock/sdk-request-middleware':
         specifier: workspace:*
         version: link:../sdk-effects/sdk-request-middleware
+      '@forgerock/sdk-store':
+        specifier: workspace:*
+        version: link:../sdk-effects/store
       '@forgerock/sdk-types':
         specifier: workspace:*
         version: link:../sdk-types
@@ -562,6 +565,9 @@ importers:
       '@forgerock/sdk-request-middleware':
         specifier: workspace:*
         version: link:../sdk-effects/sdk-request-middleware
+      '@forgerock/sdk-store':
+        specifier: workspace:*
+        version: link:../sdk-effects/store
       '@forgerock/sdk-types':
         specifier: workspace:*
         version: link:../sdk-types
@@ -632,6 +638,15 @@ importers:
         specifier: workspace:*
         version: link:../../sdk-types
 
+  packages/sdk-effects/store:
+    dependencies:
+      '@forgerock/sdk-types':
+        specifier: workspace:*
+        version: link:../../sdk-types
+      '@reduxjs/toolkit':
+        specifier: 'catalog:'
+        version: 2.10.1
+
   packages/sdk-types: {}
 
   packages/sdk-utilities:
diff --git a/tsconfig.json b/tsconfig.json
index 5bac2012e83..ad278a99c77 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -84,6 +84,9 @@
     },
     {
       "path": "./e2e/recognize-app"
+    },
+    {
+      "path": "./packages/sdk-effects/store"
     }
   ]
 }