.changeset/config.json

@@ -19,5 +19,6 @@
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true,
     "updateInternalDependents": "always"
-  }
+  },
+  "ignore": ["@clerk/tanstack-start"]
 }

.typedoc/custom-theme.mjs

@@ -345,6 +345,28 @@ class ClerkMarkdownThemeContext extends MarkdownThemeContext {
 
         return md.join('\n\n');
       },
+      /**
+       * Copied from default theme / source code. This modifies the output of union types by wrapping everything in a single `<code>foo | bar</code>` tag instead of doing `<code>foo</code>` | `<code>bar</code>`
+       * https://github.com/typedoc2md/typedoc-plugin-markdown/blob/5d7c3c7fb816b6b009f3425cf284c95400f53929/packages/typedoc-plugin-markdown/src/theme/context/partials/type.union.ts
+       * @param {import('typedoc').UnionType} model
+       */
+      unionType: model => {
+        const useCodeBlocks = this.options.getValue('useCodeBlocks');
+        const typesOut = model.types.map(unionType => {
+          // So, .someType adds the backticks to the string and we don't want to deal with modifying that partial. So just remove any backticks in the next step again :shrug:
+          const defaultResult = this.partials.someType(unionType, { forceCollapse: true });
+
+          // Remove any backticks
+          return defaultResult.replace(/`/g, '');
+        });
+
+        const shouldFormat = useCodeBlocks && (typesOut?.join('').length > 70 || typesOut?.join('').includes('\n'));
+
+        const md = typesOut.join(shouldFormat ? `\n  \\| ` : ` \\| `);
+        const result = shouldFormat ? `\n  \\| ` + md : md;
+
+        return `<code>${result}</code>`;
+      },
     };
   }
 }

integration/templates/next-app-router/src/app/(reverification)/action-with-use-reverification/page.tsx

@@ -4,7 +4,7 @@ import { useReverification } from '@clerk/nextjs';
 import { logUserIdActionReverification } from '@/app/(reverification)/actions';
 
 function Page() {
-  const [logUserWithReverification] = useReverification(logUserIdActionReverification);
+  const logUserWithReverification = useReverification(logUserIdActionReverification);
   const [pending, startTransition] = useTransition();
   const [res, setRes] = useState(null);
 

integration/testUtils/index.ts

@@ -7,7 +7,9 @@ import { createAppPageObject } from './appPageObject';
 import { createEmailService } from './emailService';
 import { createInvitationService } from './invitationsService';
 import { createKeylessPopoverPageObject } from './keylessPopoverPageObject';
+import { createOrganizationsService } from './organizationsService';
 import { createOrganizationSwitcherComponentPageObject } from './organizationSwitcherPageObject';
+import { createSessionTaskComponentPageObject } from './sessionTaskPageObject';
 import type { EnchancedPage, TestArgs } from './signInPageObject';
 import { createSignInComponentPageObject } from './signInPageObject';
 import { createSignUpComponentPageObject } from './signUpPageObject';
@@ -50,6 +52,11 @@ const createExpectPageObject = ({ page }: TestArgs) => {
         return !!window.Clerk?.user;
       });
     },
+    toHaveResolvedTask: async () => {
+      return page.waitForFunction(() => {
+        return !window.Clerk?.session?.currentTask;
+      });
+    },
   };
 };
 
@@ -87,6 +94,7 @@ export const createTestUtils = <
     email: createEmailService(),
     users: createUserService(clerkClient),
     invitations: createInvitationService(clerkClient),
+    organizations: createOrganizationsService(clerkClient),
     clerk: clerkClient,
   };
 
@@ -106,6 +114,7 @@ export const createTestUtils = <
     userButton: createUserButtonPageObject(testArgs),
     userVerification: createUserVerificationComponentPageObject(testArgs),
     waitlist: createWaitlistComponentPageObject(testArgs),
+    sessionTask: createSessionTaskComponentPageObject(testArgs),
     expect: createExpectPageObject(testArgs),
     clerk: createClerkUtils(testArgs),
   };

integration/testUtils/organizationsService.ts

@@ -0,0 +1,25 @@
+import type { ClerkClient, Organization } from '@clerk/backend';
+import { faker } from '@faker-js/faker';
+
+export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
+
+export type OrganizationService = {
+  deleteAll: () => Promise<void>;
+  createFakeOrganization: () => FakeOrganization;
+};
+
+export const createOrganizationsService = (clerkClient: ClerkClient) => {
+  const self: OrganizationService = {
+    createFakeOrganization: () => ({
+      slug: faker.helpers.slugify(faker.commerce.department()).toLowerCase(),
+      name: faker.commerce.department(),
+    }),
+    deleteAll: async () => {
+      const organizations = await clerkClient.organizations.getOrganizationList();
+      const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
+      await Promise.all(bulkDeletionPromises);
+    },
+  };
+
+  return self;
+};

integration/testUtils/sessionTaskPageObject.ts

@@ -0,0 +1,26 @@
+import { expect } from '@playwright/test';
+
+import { common } from './commonPageObject';
+import type { FakeOrganization } from './organizationsService';
+import type { TestArgs } from './signInPageObject';
+
+export const createSessionTaskComponentPageObject = (testArgs: TestArgs) => {
+  const { page } = testArgs;
+
+  const self = {
+    ...common(testArgs),
+    resolveForceOrganizationSelectionTask: async (fakeOrganization: FakeOrganization) => {
+      const createOrganizationButton = page.getByRole('button', { name: /create organization/i });
+
+      await expect(createOrganizationButton).toBeVisible();
+      expect(page.url()).toContain('add-organization');
+
+      await page.locator('input[name=name]').fill(fakeOrganization.name);
+      await page.locator('input[name=slug]').fill(fakeOrganization.slug);
+
+      await createOrganizationButton.click();
+    },
+  };
+
+  return self;
+};

integration/tests/resiliency.test.ts

@@ -80,4 +80,63 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
 
     await u.po.expect.toBeSignedIn();
   });
+
+  test('resiliency to not break devBroswer - dummy client and is not created on `/client` 4xx errors', async ({
+    page,
+    context,
+  }) => {
+    // Simulate "Needs new dev browser, when db jwt exists but does not match the instance".
+
+    const response = {
+      status: 401,
+      body: JSON.stringify({
+        errors: [
+          {
+            message: '',
+            long_message: '',
+            code: 'dev_browser_unauthenticated',
+          },
+        ],
+        clerk_trace_id: 'some-trace-id',
+      }),
+    };
+    await page.route('**/v1/client?**', route => {
+      return route.fulfill(response);
+    });
+
+    await page.route('**/v1/environment?**', route => {
+      return route.fulfill(response);
+    });
+
+    const u = createTestUtils({ app, page, context });
+
+    const waitForClientImmediately = page.waitForResponse(
+      response => response.url().includes('/client?') && response.status() === 401,
+      { timeout: 3_000 },
+    );
+
+    const waitForEnvironmentImmediately = page.waitForResponse(
+      response => response.url().includes('/environment?') && response.status() === 401,
+      { timeout: 3_000 },
+    );
+
+    await u.page.goToAppHome();
+    await page.waitForLoadState('domcontentloaded');
+
+    await waitForEnvironmentImmediately;
+    const waitForDevBrowserImmediately = page.waitForResponse(
+      response => response.url().includes('/dev_browser') && response.status() === 200,
+      {
+        timeout: 4_000,
+      },
+    );
+    await waitForClientImmediately;
+
+    // To remove specific route handlers
+    await page.unrouteAll();
+
+    await waitForDevBrowserImmediately;
+
+    await u.po.clerk.toBeLoaded();
+  });
 });

integration/tests/reverification.test.ts

@@ -144,11 +144,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
       await u.page.getByRole('button', { name: /^add$/i }).click();
 
       await u.po.userVerification.waitForMounted();
-
       await u.po.userVerification.closeReverificationModal();
-
       await u.po.userVerification.waitForClosed();
-      await u.po.userProfile.enterTestOtpCode();
 
       await expect(u.page.locator('.cl-profileSectionItem__emailAddresses')).not.toContainText(newFakeEmail);
     });

integration/tests/session-tasks-sign-in.test.ts

@@ -1,38 +1,49 @@
-import { expect, test } from '@playwright/test';
+import { test } from '@playwright/test';
 
 import { appConfigs } from '../presets';
 import type { FakeUser } from '../testUtils';
 import { createTestUtils, testAgainstRunningApps } from '../testUtils';
+import type { FakeOrganization } from '../testUtils/organizationsService';
 
 testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
   'session tasks after sign-in flow @nextjs',
   ({ app }) => {
     test.describe.configure({ mode: 'serial' });
 
     let fakeUser: FakeUser;
+    let fakeOrganization: FakeOrganization;
 
     test.beforeAll(async () => {
       const u = createTestUtils({ app });
       fakeUser = u.services.users.createFakeUser();
+      fakeOrganization = u.services.organizations.createFakeOrganization();
       await u.services.users.createBapiUser(fakeUser);
     });
 
     test.afterAll(async () => {
+      const u = createTestUtils({ app });
       await fakeUser.deleteIfExists();
+      await u.services.organizations.deleteAll();
       await app.teardown();
     });
 
     test('navigate to task on after sign-in', async ({ page, context }) => {
       const u = createTestUtils({ app, page, context });
+
+      // Performs sign-in
       await u.po.signIn.goTo();
       await u.po.signIn.setIdentifier(fakeUser.email);
       await u.po.signIn.continue();
       await u.po.signIn.setPassword(fakeUser.password);
       await u.po.signIn.continue();
       await u.po.expect.toBeSignedIn();
 
-      await expect(u.page.getByRole('button', { name: /create organization/i })).toBeVisible();
-      expect(page.url()).toContain('add-organization');
+      // Resolves task
+      await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
+      await u.po.expect.toHaveResolvedTask();
+
+      // Navigates to after sign-in
+      await u.page.waitForAppUrl('/');
     });
   },
 );

integration/tests/session-tasks-sign-up.test.ts

@@ -1,34 +1,50 @@
-import { expect, test } from '@playwright/test';
+import { test } from '@playwright/test';
 
 import { appConfigs } from '../presets';
+import type { FakeUser } from '../testUtils';
 import { createTestUtils, testAgainstRunningApps } from '../testUtils';
+import type { FakeOrganization } from '../testUtils/organizationsService';
 
 testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
   'session tasks after sign-up flow @nextjs',
   ({ app }) => {
     test.describe.configure({ mode: 'serial' });
 
+    let fakeUser: FakeUser;
+    let fakeOrganization: FakeOrganization;
+
+    test.beforeAll(() => {
+      const u = createTestUtils({ app });
+      fakeUser = u.services.users.createFakeUser({
+        fictionalEmail: true,
+        withPhoneNumber: true,
+        withUsername: true,
+      });
+      fakeOrganization = u.services.organizations.createFakeOrganization();
+    });
+
     test.afterAll(async () => {
+      const u = createTestUtils({ app });
+      await u.services.organizations.deleteAll();
+      await fakeUser.deleteIfExists();
       await app.teardown();
     });
 
     test('navigate to task on after sign-up', async ({ page, context }) => {
+      // Performs sign-up
       const u = createTestUtils({ app, page, context });
-      const fakeUser = u.services.users.createFakeUser({
-        fictionalEmail: true,
-        withPhoneNumber: true,
-        withUsername: true,
-      });
       await u.po.signUp.goTo();
       await u.po.signUp.signUpWithEmailAndPassword({
         email: fakeUser.email,
         password: fakeUser.password,
       });
 
-      await expect(u.page.getByRole('button', { name: /create organization/i })).toBeVisible();
-      expect(page.url()).toContain('add-organization');
+      // Resolves task
+      await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
+      await u.po.expect.toHaveResolvedTask();
 
-      await fakeUser.deleteIfExists();
+      // Navigates to after sign-up
+      await u.page.waitForAppUrl('/');
     });
   },
 );

integration/tests/vue/components.test.ts

@@ -225,16 +225,19 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withCustomRoles] })('basic te
     await u.page.waitForSelector('.cl-organizationSwitcherPopoverCard', { state: 'visible' });
     await u.page.locator('.cl-button__manageOrganization').click();
 
-    // Check if custom pages and links are visible
-    await expect(u.page.getByRole('button', { name: /Terms/i })).toBeVisible();
-    await expect(u.page.getByRole('button', { name: /Homepage/i })).toBeVisible();
+    // Get the organization profile dialog
+    const dialog = u.page.getByRole('dialog');
+
+    // Check if custom pages and links are visible within the dialog
+    await expect(dialog.getByRole('button', { name: /Terms/i })).toBeVisible();
+    await expect(dialog.getByRole('button', { name: /Homepage/i })).toBeVisible();
 
     // Navigate to custom page
-    await u.page.getByRole('button', { name: /Terms/i }).click();
-    await expect(u.page.getByRole('heading', { name: 'Custom Terms Page' })).toBeVisible();
+    await dialog.getByRole('button', { name: /Terms/i }).click();
+    await expect(dialog.getByRole('heading', { name: 'Custom Terms Page' })).toBeVisible();
 
     // Click custom link and check navigation
-    await u.page.getByRole('button', { name: /Homepage/i }).click();
+    await dialog.getByRole('button', { name: /Homepage/i }).click();
     await u.page.waitForAppUrl('/');
   });
 

packages/agent-toolkit/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @clerk/agent-toolkit
 
+## 0.0.12
+
+### Patch Changes
+
+- Updated dependencies [[`facefaf`](https://github.com/clerk/javascript/commit/facefafdaf6d602de0acee9218c66c61a0a9ba24), [`3910ebe`](https://github.com/clerk/javascript/commit/3910ebea85817273f18fd2f3f142dd1c728e2220), [`e513333`](https://github.com/clerk/javascript/commit/e5133330a196c5c3742634cc9c3d3233ff488b0d)]:
+  - @clerk/backend@1.25.4
+  - @clerk/types@4.49.1
+  - @clerk/shared@3.1.0
+
 ## 0.0.11
 
 ### Patch Changes

packages/agent-toolkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/agent-toolkit",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Clerk Toolkit for AI Agents",
   "homepage": "https://clerk.com/",
   "bugs": {

packages/astro/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @clerk/astro
 
+## 2.4.1
+
+### Patch Changes
+
+- Updated dependencies [[`facefaf`](https://github.com/clerk/javascript/commit/facefafdaf6d602de0acee9218c66c61a0a9ba24), [`3910ebe`](https://github.com/clerk/javascript/commit/3910ebea85817273f18fd2f3f142dd1c728e2220), [`e513333`](https://github.com/clerk/javascript/commit/e5133330a196c5c3742634cc9c3d3233ff488b0d)]:
+  - @clerk/backend@1.25.4
+  - @clerk/types@4.49.1
+  - @clerk/shared@3.1.0
+
 ## 2.4.0
 
 ### Minor Changes

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/astro",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Clerk SDK for Astro",
   "keywords": [
     "auth",