@tuturuuu/ui 0.26.1 → 0.28.0

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [0.28.0](https://github.com/tutur3u/platform/compare/ui-v0.27.0...ui-v0.28.0) (2026-08-15)
+
+
+### Features
+
+* **tasks:** add toggle blocks and repair editor indentation ([c0805c8](https://github.com/tutur3u/platform/commit/c0805c8cc0e26c172eb6f46582e267b084289501))
+
+
+### Bug Fixes
+
+* **contacts:** restore group tag labels ([9fbcb25](https://github.com/tutur3u/platform/commit/9fbcb25bd44fcedcfad4a463599940e9497ebc06))
+* **notifications:** prevent pre-hydration bell clicks ([6adba83](https://github.com/tutur3u/platform/commit/6adba83f3db63817cc64e332c33a6a2939e0bf83))
+* **ui:** support button slots with TypeScript 7 ([3bdc636](https://github.com/tutur3u/platform/commit/3bdc6368daf0be48719a479c63a6325d414233d6))
+
+## [0.27.0](https://github.com/tutur3u/platform/compare/ui-v0.26.1...ui-v0.27.0) (2026-08-14)
+
+
+### Features
+
+* **tasks:** add board lifecycle actions ([3295657](https://github.com/tutur3u/platform/commit/329565797b8bb3cefdf8f3812e6f5391576bf394))
+* **workspaces:** assign roles to pending invites ([#5125](https://github.com/tutur3u/platform/issues/5125)) ([d4052fd](https://github.com/tutur3u/platform/commit/d4052fd40de66bda4e9535740bbcfd5a8da19123))
+* **workspaces:** revamp invitation access flow ([7ea94af](https://github.com/tutur3u/platform/commit/7ea94afc2c5e14af1c83d1478ad9c006268b13c0))
+* **workspaces:** support multi-role invitations ([f6f78ba](https://github.com/tutur3u/platform/commit/f6f78bac6c2120fd70c09e85c075c4206be4f897))
+
+
+### Bug Fixes
+
+* **contacts:** preserve server referral search results ([8d0941d](https://github.com/tutur3u/platform/commit/8d0941de693fb784fd2487582d905f2cbd0fb16e))
+* **tasks:** allow board lifecycle actions ([9a6bc0c](https://github.com/tutur3u/platform/commit/9a6bc0ce31c4191bed81607fdb5c9ee2af8e1d04))
+* **workspaces:** manage roles for pending invites ([2466f6c](https://github.com/tutur3u/platform/commit/2466f6cbbd447207d87eb0e0d78b3c713b02b739))
+
+
+### Performance Improvements
+
+* **vercel:** reduce realtime fallback polling ([e9e44a4](https://github.com/tutur3u/platform/commit/e9e44a4eb17c971beb9e1b737c4580466e427be5))
+* **vercel:** reduce realtime fallback polling ([#5126](https://github.com/tutur3u/platform/issues/5126)) ([fde2692](https://github.com/tutur3u/platform/commit/fde2692ff73a45616a40b93de9fff30ffc941fd2))
+
 ## [0.26.1](https://github.com/tutur3u/platform/compare/ui-v0.26.0...ui-v0.26.1) (2026-08-11)
 
 

package/biome.json

@@ -1,5 +1,5 @@
 {
   "root": false,
-  "$schema": "https://biomejs.dev/schemas/2.5.7/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.5.8/schema.json",
   "extends": "//"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuturuuu/ui",
-  "version": "0.26.1",
+  "version": "0.28.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -56,43 +56,44 @@
     "@streamdown/math": "^1.0.2",
     "@streamdown/mermaid": "^1.0.2",
     "@tanstack/react-hotkeys": "^0.10.0",
-    "@tanstack/react-pacer": "^0.22.1",
+    "@tanstack/react-pacer": "^0.23.0",
     "@tanstack/react-query": "^5.101.2",
     "@tanstack/react-table": "^9.0.0",
     "@tanstack/react-virtual": "^3.14.9",
-    "@tiptap/core": "3.29.2",
-    "@tiptap/extension-collaboration": "3.29.2",
-    "@tiptap/extension-collaboration-caret": "3.29.2",
-    "@tiptap/extension-color": "3.29.2",
-    "@tiptap/extension-drag-handle": "3.29.2",
-    "@tiptap/extension-drag-handle-react": "3.29.2",
-    "@tiptap/extension-highlight": "3.29.2",
-    "@tiptap/extension-horizontal-rule": "3.29.2",
-    "@tiptap/extension-image": "3.29.2",
-    "@tiptap/extension-link": "3.29.2",
-    "@tiptap/extension-list": "3.29.2",
-    "@tiptap/extension-node-range": "3.29.2",
-    "@tiptap/extension-placeholder": "3.29.2",
-    "@tiptap/extension-strike": "3.29.2",
-    "@tiptap/extension-subscript": "3.29.2",
-    "@tiptap/extension-superscript": "3.29.2",
-    "@tiptap/extension-table": "3.29.2",
-    "@tiptap/extension-table-cell": "3.29.2",
-    "@tiptap/extension-table-header": "3.29.2",
-    "@tiptap/extension-table-row": "3.29.2",
-    "@tiptap/extension-text-align": "3.29.2",
-    "@tiptap/extension-text-style": "3.29.2",
-    "@tiptap/extension-youtube": "3.29.2",
-    "@tiptap/pm": "3.29.2",
-    "@tiptap/react": "3.29.2",
-    "@tiptap/starter-kit": "3.29.2",
-    "@tuturuuu/ai": "0.8.1",
-    "@tuturuuu/apis": "0.11.0",
-    "@tuturuuu/hooks": "0.1.0",
+    "@tiptap/core": "3.30.0",
+    "@tiptap/extension-collaboration": "3.30.0",
+    "@tiptap/extension-collaboration-caret": "3.30.0",
+    "@tiptap/extension-color": "3.30.0",
+    "@tiptap/extension-details": "3.30.0",
+    "@tiptap/extension-drag-handle": "3.30.0",
+    "@tiptap/extension-drag-handle-react": "3.30.0",
+    "@tiptap/extension-highlight": "3.30.0",
+    "@tiptap/extension-horizontal-rule": "3.30.0",
+    "@tiptap/extension-image": "3.30.0",
+    "@tiptap/extension-link": "3.30.0",
+    "@tiptap/extension-list": "3.30.0",
+    "@tiptap/extension-node-range": "3.30.0",
+    "@tiptap/extension-placeholder": "3.30.0",
+    "@tiptap/extension-strike": "3.30.0",
+    "@tiptap/extension-subscript": "3.30.0",
+    "@tiptap/extension-superscript": "3.30.0",
+    "@tiptap/extension-table": "3.30.0",
+    "@tiptap/extension-table-cell": "3.30.0",
+    "@tiptap/extension-table-header": "3.30.0",
+    "@tiptap/extension-table-row": "3.30.0",
+    "@tiptap/extension-text-align": "3.30.0",
+    "@tiptap/extension-text-style": "3.30.0",
+    "@tiptap/extension-youtube": "3.30.0",
+    "@tiptap/pm": "3.30.0",
+    "@tiptap/react": "3.30.0",
+    "@tiptap/starter-kit": "3.30.0",
+    "@tuturuuu/ai": "0.8.2",
+    "@tuturuuu/apis": "0.11.2",
+    "@tuturuuu/hooks": "0.1.1",
     "@tuturuuu/icons": "0.1.0",
-    "@tuturuuu/internal-api": "0.29.0",
+    "@tuturuuu/internal-api": "0.31.0",
     "@tuturuuu/supabase": "0.5.0",
-    "@tuturuuu/utils": "0.24.1",
+    "@tuturuuu/utils": "0.25.1",
     "@types/debug": "^4.1.13",
     "browser-image-compression": "^2.0.2",
     "class-variance-authority": "^0.7.1",
@@ -104,17 +105,17 @@
     "debug": "^4.4.3",
     "embla-carousel-react": "^8.6.0",
     "eventemitter3": "^5.0.4",
-    "framer-motion": "^13.0.0",
+    "framer-motion": "^13.1.0",
     "gsap": "^3.15.0",
     "html-entities": "^2.6.0",
-    "html2canvas-pro": "^2.3.3",
+    "html2canvas-pro": "^2.3.6",
     "input-otp": "^1.4.2",
-    "katex": "^0.18.1",
+    "katex": "^0.18.4",
     "lodash": "4.18.1",
     "moment": "^2.30.1",
-    "motion": "^13.0.0",
-    "next": "^16.3.0",
-    "next-intl": "^4.13.5",
+    "motion": "^13.1.0",
+    "next": "^16.3.1",
+    "next-intl": "^4.13.6",
     "next-themes": "^0.4.6",
     "nuqs": "^2.9.5",
     "prosemirror-state": "^1.4.4",
@@ -124,8 +125,8 @@
     "react-colorful": "^5.8.0",
     "react-day-picker": "^10.0.1",
     "react-dom": "^19.2.8",
-    "react-dropzone": "^20.0.0",
-    "react-hook-form": "^7.84.0",
+    "react-dropzone": "^20.1.0",
+    "react-hook-form": "^7.85.0",
     "react-markdown": "^10.1.0",
     "react-papaparse": "^4.4.0",
     "react-pdf": "^10.4.1",
@@ -133,13 +134,13 @@
     "react-resizable-panels": "^4.12.2",
     "react-syntax-highlighter": "^16.1.1",
     "recharts": "3.10.1",
-    "slot-text": "^0.3.3",
-    "sonner": "^2.0.7",
+    "slot-text": "^0.3.4",
+    "sonner": "^2.0.8",
     "streamdown": "^2.5.0",
     "tailwind-scrollbar": "^4.0.2",
     "tailwind-scrollbar-hide": "^4.0.0",
     "tailwindcss-animate": "^1.0.7",
-    "tiptap-extension-resize-image": "^1.4.5",
+    "tiptap-extension-resize-image": "^1.4.6",
     "use-debounce": "^10.1.1",
     "vaul": "^1.1.2",
     "y-protocols": "^1.0.7",
@@ -150,14 +151,14 @@
     "@tailwindcss/postcss": "^4.3.3",
     "@tailwindcss/typography": "^0.5.20",
     "@tanstack/react-query": "^5.101.4",
-    "@tanstack/react-table": "^9.0.0",
-    "@testing-library/jest-dom": "^7.0.0",
+    "@tanstack/react-table": "^9.1.2",
+    "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.2",
     "@tuturuuu/types": "0.27.0",
     "@tuturuuu/typescript-config": "0.1.1",
     "@types/html2canvas": "^1.0.0",
     "@types/lodash": "^4.17.25",
-    "@types/node": "^26.1.2",
+    "@types/node": "^26.2.0",
     "@types/react": "^19.2.18",
     "@types/react-dom": "^19.2.4",
     "@types/react-resizable": "^4.0.0",
@@ -166,7 +167,7 @@
     "@vitejs/plugin-react": "^6.0.5",
     "autoprefixer": "^10.5.4",
     "jsdom": "^30.0.1",
-    "postcss": "^8.5.25",
+    "postcss": "^8.5.26",
     "postcss-load-config": "^6.0.1",
     "tailwindcss": "^4.3.3",
     "typescript": "7.0.2",

package/src/components/ui/button.tsx

@@ -46,15 +46,19 @@ function Button({
   VariantProps<typeof buttonVariants> & {
     asChild?: boolean;
   }) {
-  const Comp = asChild ? Slot : 'button';
+  const classNames = cn(buttonVariants({ variant, size, className }));
 
-  return (
-    <Comp
-      data-slot="button"
-      className={cn(buttonVariants({ variant, size, className }))}
-      {...props}
-    />
-  );
+  if (asChild) {
+    return (
+      <Slot
+        data-slot="button"
+        className={classNames}
+        {...(props as React.ComponentProps<typeof Slot>)}
+      />
+    );
+  }
+
+  return <button data-slot="button" className={classNames} {...props} />;
 }
 
 type ButtonProps = React.ComponentProps<typeof Button>;

package/src/components/ui/color-picker.test.tsx

@@ -0,0 +1,23 @@
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { ColorPicker } from './color-picker';
+
+vi.mock('../../hooks/use-dom-resolved-theme', () => ({
+  useDomResolvedTheme: () => 'light',
+}));
+
+describe('ColorPicker', () => {
+  it('renders the supplied read-only label', () => {
+    render(<ColorPicker text="Visible workspace tag" value="#123456" />);
+
+    expect(
+      screen.getByRole('button', { name: 'Visible workspace tag' })
+    ).toBeVisible();
+  });
+
+  it('keeps the icon-only control when no label is supplied', () => {
+    const { container } = render(<ColorPicker value="#123456" />);
+
+    expect(container.querySelector('button svg')).toBeTruthy();
+  });
+});

package/src/components/ui/color-picker.tsx

@@ -65,7 +65,7 @@ const ColorPicker = forwardRef<
             variant="outline"
             disabled={disabled}
           >
-            <TextIcon className="h-4 w-4" />
+            {text || <TextIcon className="h-4 w-4" />}
           </Button>
         </PopoverTrigger>
         <PopoverContent className="flex w-full flex-col items-center justify-center gap-4">

package/src/components/ui/custom/combobox.tsx

@@ -101,6 +101,8 @@ interface ComboboxProps {
   onCreate?: (value: string) => unknown | Promise<unknown>;
   /** Callback when search input changes */
   onSearchChange?: (value: string) => void;
+  /** Whether Command should filter the provided options locally */
+  shouldFilter?: boolean;
   /** Callback when the popover opens or closes */
   onOpenChange?: (open: boolean) => void;
   /** Whether there are more options to load */
@@ -148,6 +150,7 @@ export function Combobox({
   useFirstValueAsDefault = false,
   onCreate,
   onSearchChange,
+  shouldFilter = true,
   onOpenChange,
   hasMore = false,
   onLoadMore,
@@ -543,6 +546,7 @@ export function Combobox({
           sideOffset={4}
         >
           <Command
+            shouldFilter={shouldFilter}
             filter={(value, search) => {
               if (value.startsWith(actionValuePrefix)) return 1;
               if (value.startsWith(createValuePrefix)) return 1;

package/src/components/ui/custom/notification-popover-client.tsx

@@ -41,7 +41,7 @@ import {
   dispatchRequestOpenTask,
   waitForTaskOpenResult,
 } from '@tuturuuu/ui/lib/task-open-events';
-import { Popover, PopoverContent, PopoverTrigger } from '@tuturuuu/ui/popover';
+import { Popover, PopoverContent } from '@tuturuuu/ui/popover';
 import { toast } from '@tuturuuu/ui/sonner';
 import { cn } from '@tuturuuu/utils/format';
 import dayjs from 'dayjs';
@@ -49,6 +49,7 @@ import relativeTime from 'dayjs/plugin/relativeTime';
 import Link from 'next/link';
 import { useParams, usePathname, useRouter } from 'next/navigation';
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { NotificationPopoverTriggerButton } from './notification-popover-trigger';
 
 dayjs.extend(relativeTime);
 
@@ -190,24 +191,10 @@ export default function NotificationPopoverClient({
 
   return (
     <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger asChild>
-        <Button
-          variant="ghost"
-          size="icon"
-          aria-label={notificationsText}
-          title={notificationsText}
-          className="group relative flex size-10 flex-none transition-all"
-        >
-          <Bell className="h-6 w-6" />
-          {unreadCount > 0 && (
-            <div className="absolute top-1 right-2 flex h-1.5 w-1.5 flex-none items-center justify-center rounded-full bg-dynamic-red p-1 text-center font-semibold text-xs transition-all group-hover:-top-2 group-hover:-right-1 group-hover:h-5 group-hover:w-auto group-hover:px-1.5 group-hover:text-background">
-              <div className="relative opacity-0 group-hover:opacity-100">
-                {unreadCount > 99 ? '99+' : unreadCount}
-              </div>
-            </div>
-          )}
-        </Button>
-      </PopoverTrigger>
+      <NotificationPopoverTriggerButton
+        notificationsText={notificationsText}
+        unreadCount={unreadCount}
+      />
       <PopoverContent
         className="w-100 overflow-hidden rounded-xl border p-0 shadow-xl"
         align="end"

package/src/components/ui/custom/notification-popover-trigger.test.tsx

@@ -0,0 +1,37 @@
+import '@testing-library/jest-dom';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { Popover } from '@tuturuuu/ui/popover';
+import { renderToString } from 'react-dom/server';
+import { describe, expect, it } from 'vitest';
+import { NotificationPopoverTriggerButton } from './notification-popover-trigger';
+
+function TriggerHarness({ unreadCount = 0 }: { unreadCount?: number }) {
+  return (
+    <Popover>
+      <NotificationPopoverTriggerButton
+        notificationsText="Notifications"
+        unreadCount={unreadCount}
+      />
+    </Popover>
+  );
+}
+
+describe('NotificationPopoverTriggerButton', () => {
+  it('disables the server-rendered trigger until event handlers are attached', () => {
+    const markup = renderToString(<TriggerHarness unreadCount={1} />);
+
+    expect(markup).toContain('disabled=""');
+  });
+
+  it('enables the trigger after hydration and opens the popover on the first click', async () => {
+    render(<TriggerHarness unreadCount={1} />);
+
+    const trigger = screen.getByRole('button', { name: 'Notifications' });
+    await waitFor(() => expect(trigger).toBeEnabled());
+    fireEvent.click(trigger);
+
+    await waitFor(() =>
+      expect(trigger).toHaveAttribute('aria-expanded', 'true')
+    );
+  });
+});

package/src/components/ui/custom/notification-popover-trigger.tsx

@@ -0,0 +1,44 @@
+'use client';
+
+import { Bell } from '@tuturuuu/icons';
+import { Button } from '@tuturuuu/ui/button';
+import { PopoverTrigger } from '@tuturuuu/ui/popover';
+import { useEffect, useState } from 'react';
+
+interface NotificationPopoverTriggerProps {
+  notificationsText: string;
+  unreadCount: number;
+}
+
+export function NotificationPopoverTriggerButton({
+  notificationsText,
+  unreadCount,
+}: NotificationPopoverTriggerProps) {
+  const [isHydrated, setIsHydrated] = useState(false);
+
+  useEffect(() => {
+    setIsHydrated(true);
+  }, []);
+
+  return (
+    <PopoverTrigger asChild>
+      <Button
+        variant="ghost"
+        size="icon"
+        aria-label={notificationsText}
+        title={notificationsText}
+        disabled={!isHydrated}
+        className="group relative flex size-10 flex-none transition-all"
+      >
+        <Bell className="h-6 w-6" />
+        {unreadCount > 0 && (
+          <div className="absolute top-1 right-2 flex h-1.5 w-1.5 flex-none items-center justify-center rounded-full bg-dynamic-red p-1 text-center font-semibold text-xs transition-all group-hover:-top-2 group-hover:-right-1 group-hover:h-5 group-hover:w-auto group-hover:px-1.5 group-hover:text-background">
+            <div className="relative opacity-0 group-hover:opacity-100">
+              {unreadCount > 99 ? '99+' : unreadCount}
+            </div>
+          </div>
+        )}
+      </Button>
+    </PopoverTrigger>
+  );
+}

package/src/components/ui/custom/workspace-access/adapters.test.ts

@@ -1,9 +1,21 @@
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 import {
   createStandardWorkspaceAccessAdapter,
+  mergeWorkspaceInvitationRoles,
   normalizeWorkspaceAccessRole,
 } from './adapters';
 
+const mocks = vi.hoisted(() => ({
+  inviteWorkspaceMember: vi.fn().mockResolvedValue({ message: 'success' }),
+}));
+
+vi.mock('@tuturuuu/internal-api/workspaces', async (importOriginal) => ({
+  ...(await importOriginal<
+    typeof import('@tuturuuu/internal-api/workspaces')
+  >()),
+  inviteWorkspaceMember: mocks.inviteWorkspaceMember,
+}));
+
 describe('workspace access adapters', () => {
   it('normalizes role permissions into the shared access role shape', () => {
     expect(
@@ -37,4 +49,80 @@ describe('workspace access adapters', () => {
       createStandardWorkspaceAccessAdapter().updateMemberProfile
     ).toBeTypeOf('function');
   });
+
+  it('hydrates pending email and registered-user invitations with their assigned roles', () => {
+    const members = mergeWorkspaceInvitationRoles(
+      [
+        {
+          default_permissions: [],
+          email: 'pending@example.com',
+          id: null,
+          is_creator: false,
+          pending: true,
+          roles: [],
+        },
+        {
+          default_permissions: [],
+          email: null,
+          id: 'user-2',
+          is_creator: false,
+          pending: true,
+          roles: [],
+        },
+        {
+          default_permissions: [],
+          email: 'joined@example.com',
+          id: 'user-3',
+          is_creator: false,
+          pending: false,
+          roles: [{ id: 'role-owner', name: 'Owner', permissions: [] }],
+        },
+      ],
+      [
+        {
+          email: 'Pending@Example.com',
+          roles: [
+            { id: 'role-editor', name: 'Editor' },
+            { id: 'role-reviewer', name: 'Reviewer' },
+          ],
+          userId: null,
+        },
+        {
+          email: null,
+          roles: [{ id: 'role-reviewer', name: 'Reviewer' }],
+          userId: 'user-2',
+        },
+      ]
+    );
+
+    expect(members[0]?.roles).toEqual([
+      { id: 'role-editor', name: 'Editor', permissions: [] },
+      { id: 'role-reviewer', name: 'Reviewer', permissions: [] },
+    ]);
+    expect(members[1]?.roles).toEqual([
+      { id: 'role-reviewer', name: 'Reviewer', permissions: [] },
+    ]);
+    expect(members[2]?.roles).toEqual([
+      { id: 'role-owner', name: 'Owner', permissions: [] },
+    ]);
+  });
+
+  it('forwards multiple role assignments with every standard invite', async () => {
+    const adapter = createStandardWorkspaceAccessAdapter();
+
+    await adapter.inviteMembers('ws-1', {
+      accessPreset: 'member',
+      emails: ['editor@example.com'],
+      memberType: 'MEMBER',
+      roleIds: ['role-editor', 'role-reviewer'],
+    });
+
+    expect(mocks.inviteWorkspaceMember).toHaveBeenCalledWith('ws-1', {
+      accessPreset: 'member',
+      confirmDefaultAdminMigration: undefined,
+      email: 'editor@example.com',
+      memberType: 'MEMBER',
+      roleIds: ['role-editor', 'role-reviewer'],
+    });
+  });
 });

package/src/components/ui/custom/workspace-access/adapters.ts

@@ -17,17 +17,24 @@ import {
   createWorkspaceRole,
   deleteWorkspaceRole,
   getWorkspaceDefaultPermissions,
+  listWorkspaceRoleOptions,
   listWorkspaceRoles,
   updateWorkspaceDefaultPermissions,
   updateWorkspaceRole,
 } from '@tuturuuu/internal-api/settings';
+import type { WorkspaceInvitationRoleAssignment } from '@tuturuuu/internal-api/workspaces';
 import {
   inviteWorkspaceMember,
   listEnhancedWorkspaceMembers,
+  listWorkspaceInvitationRoles,
   removeWorkspaceMember,
+  updateWorkspaceInvitationRole,
   updateWorkspaceMemberProfile,
 } from '@tuturuuu/internal-api/workspaces';
-import type { WorkspaceRole } from '@tuturuuu/types';
+import type {
+  InternalApiEnhancedWorkspaceMember,
+  WorkspaceRole,
+} from '@tuturuuu/types';
 import type {
   WorkspaceAccessAdapter,
   WorkspaceAccessInvitePayload,
@@ -60,6 +67,54 @@ export function normalizeWorkspaceAccessRole(role: RoleLike) {
   } satisfies WorkspaceAccessRole;
 }
 
+export function mergeWorkspaceInvitationRoles(
+  members: InternalApiEnhancedWorkspaceMember[],
+  invitations: WorkspaceInvitationRoleAssignment[]
+) {
+  const byUserId = new Map(
+    invitations
+      .filter((invitation) => invitation.userId)
+      .map((invitation) => [invitation.userId, invitation])
+  );
+  const byEmail = new Map(
+    invitations
+      .filter((invitation) => invitation.email)
+      .map((invitation) => [invitation.email?.trim().toLowerCase(), invitation])
+  );
+
+  return members.map((member) => {
+    if (!member.pending) return member;
+
+    const invitation =
+      (member.id ? byUserId.get(member.id) : undefined) ??
+      (member.email
+        ? byEmail.get(member.email.trim().toLowerCase())
+        : undefined);
+
+    return {
+      ...member,
+      roles: (invitation?.roles ?? []).map((role) => ({
+        ...role,
+        permissions: [],
+      })),
+    };
+  });
+}
+
+async function listStandardWorkspaceMembers(
+  workspaceId: string,
+  status?: 'all' | 'invited' | 'joined'
+) {
+  const [members, invitations] = await Promise.all([
+    listEnhancedWorkspaceMembers(workspaceId, status),
+    status === 'joined'
+      ? Promise.resolve([])
+      : listWorkspaceInvitationRoles(workspaceId),
+  ]);
+
+  return mergeWorkspaceInvitationRoles(members, invitations);
+}
+
 async function inviteStandardWorkspaceMembers(
   workspaceId: string,
   payload: WorkspaceAccessInvitePayload
@@ -74,6 +129,7 @@ async function inviteStandardWorkspaceMembers(
         confirmDefaultAdminMigration: payload.confirmDefaultAdminMigration,
         email,
         memberType: payload.memberType,
+        roleIds: payload.roleIds,
       };
       return inviteWorkspaceMember(workspaceId, invitePayload);
     })
@@ -132,7 +188,8 @@ export function createStandardWorkspaceAccessAdapter(): WorkspaceAccessAdapter {
       return role;
     },
     inviteMembers: inviteStandardWorkspaceMembers,
-    listMembers: listEnhancedWorkspaceMembers,
+    listMembers: listStandardWorkspaceMembers,
+    listRoleOptions: listWorkspaceRoleOptions,
     listRoles: async (workspaceId, query) => {
       const result = await listWorkspaceRoles(workspaceId, {
         page: query?.page ?? '1',
@@ -148,6 +205,7 @@ export function createStandardWorkspaceAccessAdapter(): WorkspaceAccessAdapter {
     removeMember: removeWorkspaceMember,
     removeRoleMember,
     updateMemberProfile: updateWorkspaceMemberProfile,
+    updateInvitationRole: updateWorkspaceInvitationRole,
     updateDefaultRole: (workspaceId, memberType, payload) =>
       updateWorkspaceDefaultPermissions(workspaceId, memberType, {
         permissions: payload.permissions as WorkspaceRole['permissions'],
@@ -170,6 +228,13 @@ export function createExternalProjectWorkspaceAccessAdapter(): WorkspaceAccessAd
     inviteMembers: (workspaceId, payload) =>
       inviteWorkspaceExternalProjectMembers(workspaceId, payload.emails),
     listMembers: listWorkspaceExternalProjectMembers,
+    listRoleOptions: async (workspaceId) => {
+      const roles = await listWorkspaceExternalProjectRoles(workspaceId);
+      return {
+        count: roles.length,
+        data: roles.map(({ id, name }) => ({ id, name })),
+      };
+    },
     listRoles: async (workspaceId, query) => {
       const roles = (await listWorkspaceExternalProjectRoles(workspaceId)).map(
         normalizeWorkspaceAccessRole