@nocobase/app-template-default 1.0.0-beta.75 → 1.0.0-beta.77

package/client/pages/settings/users.tsx

@@ -1,3 +1,7 @@
+import { RecordLink } from '#components/record-link';
+import { BackButton } from '#components/back-button';
+import { safeReturnTo } from '../../lib/return-to.js';
+import { useTableUrlState } from '#hooks/use-table-url-state';
 import { DataTable, DataTableColumnHeader } from '#components/data-table';
 import type { ColumnDef } from '@tanstack/react-table';
 import { useSettingsData, useUserPermission } from './hooks.js';
@@ -6,21 +10,29 @@ import { useTranslation } from '@nocobase/i18n/client';
 import {
   UsersClient,
   type ManagedUser,
+  type UsersOptions,
 } from '@nocobase/app-plugin-users/client/user-client';
 import {
   useCallback,
+  useRef,
   useMemo,
   useState,
   useEffect,
   type ReactElement,
 } from 'react';
-import { Link, Outlet, useLocation, useSearchParams } from 'react-router';
-import { MoreHorizontalIcon, PlusIcon, UsersIcon } from 'lucide-react';
+import {
+  Link,
+  Outlet,
+  useLocation,
+  useSearchParams,
+  useResolvedPath,
+} from 'react-router';
+import { PlusIcon, UsersIcon } from 'lucide-react';
 import { PageContainer } from '#components/page-container';
 import { PageHeader } from '#components/page-header';
 import { Button } from '#components/ui/button';
 import { Input } from '#components/ui/input';
-import { Badge } from '#components/ui/badge';
+import { StatusBadge } from '#components/status-badge';
 import {
   Select,
   SelectTrigger,
@@ -28,13 +40,6 @@ import {
   SelectContent,
   SelectItem,
 } from '#components/ui/select';
-import {
-  DropdownMenu,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuSeparator,
-} from '#components/ui/dropdown-menu';
 import {
   Empty,
   EmptyMedia,
@@ -44,6 +49,19 @@ import {
 } from '#components/ui/empty';
 import { ConfirmAction, SettingsError, SettingsLoading } from './shared.js';
 
+function UserName({ user }: { readonly user: ManagedUser }): ReactElement {
+  const canUpdate = useUserPermission('update', user.id);
+  const canAssign = useUserPermission('assign-role', user.id);
+  const location = useLocation();
+  return canUpdate || canAssign ? (
+    <RecordLink to={{ pathname: `${user.id}/edit`, search: location.search }}>
+      {user.name}
+    </RecordLink>
+  ) : (
+    <span className='font-medium'>{user.name}</span>
+  );
+}
+
 function UserActions({
   user,
   reload,
@@ -55,11 +73,9 @@ function UserActions({
   const api = useApiClient();
   const toaster = useToaster();
   const client = useMemo(() => new UsersClient(api), [api]);
-  const canUpdate = useUserPermission('update', user.id);
   const canDisable = useUserPermission('disable', user.id);
   const canEnable = useUserPermission('enable', user.id);
   const canRevoke = useUserPermission('revoke-sessions', user.id);
-  const location = useLocation();
   const [action, setAction] = useState<
     'disable' | 'enable' | 'revokeSessions'
   >();
@@ -73,7 +89,7 @@ function UserActions({
       const updated = await client[action](user.id);
       toaster.show({
         type: 'success',
-        title: t('settings.actionSaved', { name: user.name }),
+        title: t(`settings.userActionSaved.${action}`, { name: user.name }),
       });
       setAction(undefined);
       reload(updated ?? undefined);
@@ -83,56 +99,32 @@ function UserActions({
       setBusy(false);
     }
   };
+  if (!canRevoke && !(user.disabledAt ? canEnable : canDisable)) return <></>;
   return (
-    <>
-      <DropdownMenu>
-        <DropdownMenuTrigger
-          render={
-            <Button
-              size='icon-sm'
-              variant='ghost'
-              aria-label={t('settings.actionsFor', { name: user.name })}
-            >
-              <MoreHorizontalIcon />
-            </Button>
-          }
-        />
-        <DropdownMenuContent align='end' className='w-auto min-w-40'>
-          {canUpdate && (
-            <DropdownMenuItem
-              render={
-                <Link
-                  to={{ pathname: `${user.id}/edit`, search: location.search }}
-                />
-              }
-            >
-              {t('settings.edit')}
-            </DropdownMenuItem>
-          )}
-          {(canDisable || canEnable || canRevoke) && <DropdownMenuSeparator />}
-          {!user.disabledAt && canDisable && (
-            <DropdownMenuItem
-              variant='destructive'
-              onClick={() => setAction('disable')}
-            >
-              {t('settings.disable')}
-            </DropdownMenuItem>
-          )}
-          {user.disabledAt && canEnable && (
-            <DropdownMenuItem onClick={() => setAction('enable')}>
-              {t('settings.enable')}
-            </DropdownMenuItem>
-          )}
-          {canRevoke && (
-            <DropdownMenuItem
-              variant='destructive'
-              onClick={() => setAction('revokeSessions')}
-            >
-              {t('settings.revokeSessions')}
-            </DropdownMenuItem>
-          )}
-        </DropdownMenuContent>
-      </DropdownMenu>
+    <div className='flex items-center justify-end gap-2 whitespace-nowrap'>
+      {!user.disabledAt && canDisable && (
+        <Button
+          variant='outline'
+          size='xs'
+          onClick={() => setAction('disable')}
+        >
+          {t('settings.disable')}
+        </Button>
+      )}
+      {user.disabledAt && canEnable && (
+        <Button variant='outline' size='xs' onClick={() => setAction('enable')}>
+          {t('settings.enable')}
+        </Button>
+      )}
+      {canRevoke && (
+        <Button
+          variant='outline'
+          size='xs'
+          onClick={() => setAction('revokeSessions')}
+        >
+          {t('settings.revokeSessions')}
+        </Button>
+      )}
       <ConfirmAction
         open={Boolean(action)}
         title={t(
@@ -158,7 +150,7 @@ function UserActions({
         onCancel={() => setAction(undefined)}
         onConfirm={() => void run()}
       />
-    </>
+    </div>
   );
 }
 
@@ -166,6 +158,24 @@ export default function UsersPage(): ReactElement {
   const { t } = useTranslation();
   const [params, setParams] = useSearchParams();
   const location = useLocation();
+  const listPath = useResolvedPath('.').pathname;
+  const searchRef = useRef<HTMLInputElement>(null);
+  const previousPathRef = useRef(location.pathname);
+  useEffect(() => {
+    const returned =
+      previousPathRef.current !== location.pathname &&
+      location.pathname === listPath;
+    previousPathRef.current = location.pathname;
+    if (!returned) return;
+    const frame = requestAnimationFrame(() => {
+      if (
+        document.activeElement === document.body ||
+        !document.activeElement?.isConnected
+      )
+        searchRef.current?.focus();
+    });
+    return () => cancelAnimationFrame(frame);
+  }, [listPath, location.pathname]);
   const [queryDraft, setQueryDraft] = useState<{
     key: string;
     value: string;
@@ -177,7 +187,43 @@ export default function UsersPage(): ReactElement {
   const setQuery = (value: string) =>
     setQueryDraft({ key: location.key, value });
   const [composing, setComposing] = useState(false);
-  const page = Math.max(1, Number(params.get('page')) || 1);
+  const options = useSettingsData<{ data: UsersOptions }>('users/options');
+  const roleScopes = useMemo(
+    () => options.data?.data.roleScopes ?? [],
+    [options.data],
+  );
+  const returnTo = safeReturnTo(params.get('returnTo'));
+  const roleScope = params.get('roleScope') ?? '';
+  const role = params.get('role') ?? '';
+  const roleText = useCallback(
+    (option: { label: string; labelI18nKey?: string; labelI18nNs?: string }) =>
+      option.labelI18nKey
+        ? t(option.labelI18nKey, {
+            ns: option.labelI18nNs,
+            defaultValue: option.label,
+          })
+        : option.label,
+    [t],
+  );
+  const roleChoices = roleScopes.flatMap((scope) =>
+    scope.options.map((option) => ({
+      value: JSON.stringify([scope.key, option.value]),
+      label: `${roleText(scope)} · ${roleText(option)}`,
+    })),
+  );
+  const selectedRole =
+    roleScope && role ? JSON.stringify([roleScope, role]) : 'all';
+  if (
+    selectedRole !== 'all' &&
+    !roleChoices.some((option) => option.value === selectedRole)
+  )
+    roleChoices.push({ value: selectedRole, label: `${roleScope} · ${role}` });
+  const page = Math.max(
+    1,
+    Number.isSafeInteger(Number(params.get('page')))
+      ? Number(params.get('page'))
+      : 1,
+  );
   const status = params.get('status') ?? 'all';
   const pageSize = [20, 50, 100].includes(Number(params.get('pageSize')))
     ? Number(params.get('pageSize'))
@@ -215,6 +261,8 @@ export default function UsersPage(): ReactElement {
     pageSize: String(pageSize),
     ...(params.get('q') ? { q: params.get('q')! } : {}),
     ...(status !== 'all' ? { status } : {}),
+    ...(roleScope ? { roleScope } : {}),
+    ...(role ? { role } : {}),
     ...(params.get('order')
       ? { sort: 'name', order: params.get('order')! }
       : {}),
@@ -223,6 +271,25 @@ export default function UsersPage(): ReactElement {
     data: readonly ManagedUser[];
     meta: { total: number };
   }>(`users?${remote}`, true);
+  const tableState = useTableUrlState({
+    defaultPageSize: 20,
+    pageSizeOptions: [20, 50, 100],
+    sortColumns: ['name'],
+    rowCount:
+      !request.loading && !request.error ? request.data?.meta.total : undefined,
+  });
+  const clearFilters = () => {
+    setQuery('');
+    setParams(
+      (old) => {
+        const next = new URLSearchParams(old);
+        for (const key of ['q', 'status', 'roleScope', 'role', 'page'])
+          next.delete(key);
+        return next;
+      },
+      { replace: true },
+    );
+  };
   const { data: pageData, replaceData, reload: refreshUsers } = request;
   const reload = useCallback(
     (updated?: ManagedUser) => {
@@ -234,8 +301,10 @@ export default function UsersPage(): ReactElement {
           ),
         });
       refreshUsers();
+      if (updated && location.pathname === listPath)
+        requestAnimationFrame(() => searchRef.current?.focus());
     },
-    [pageData, replaceData, refreshUsers],
+    [pageData, replaceData, refreshUsers, location.pathname, listPath],
   );
   const canCreate = useUserPermission('create');
   const canAssign = useUserPermission('assign-role');
@@ -248,17 +317,7 @@ export default function UsersPage(): ReactElement {
           <DataTableColumnHeader column={column} title={t('settings.name')} />
         ),
         enableHiding: false,
-        cell: ({ row }) => (
-          <Link
-            className='font-medium text-foreground underline-offset-4 hover:underline'
-            to={{
-              pathname: row.original.id,
-              search: location.search,
-            }}
-          >
-            {row.original.name}
-          </Link>
-        ),
+        cell: ({ row }) => <UserName user={row.original} />,
       },
       {
         accessorKey: 'email',
@@ -275,13 +334,13 @@ export default function UsersPage(): ReactElement {
         header: t('settings.status'),
         enableSorting: false,
         cell: ({ row }) => (
-          <Badge variant='secondary'>
+          <StatusBadge tone={row.original.disabledAt ? 'neutral' : 'success'}>
             {t(
               row.original.disabledAt
                 ? 'settings.disabled'
                 : 'settings.enabled',
             )}
-          </Badge>
+          </StatusBadge>
         ),
       },
       {
@@ -289,7 +348,19 @@ export default function UsersPage(): ReactElement {
         header: t('settings.assignedRoles'),
         enableSorting: false,
         cell: ({ row }) =>
-          Object.values(row.original.roleScopes).flat().join(', ') || '—',
+          Object.entries(row.original.roleScopes)
+            .flatMap(([scopeKey, value]) => {
+              const scope = roleScopes.find((entry) => entry.key === scopeKey);
+              return (typeof value === 'string' ? [value] : value).map(
+                (key) => {
+                  const option = scope?.options.find(
+                    (entry) => entry.value === key,
+                  );
+                  return option ? roleText(option) : key;
+                },
+              );
+            })
+            .join(', ') || '—',
       },
       {
         id: 'actions',
@@ -298,7 +369,7 @@ export default function UsersPage(): ReactElement {
         cell: ({ row }) => <UserActions user={row.original} reload={reload} />,
       },
     ],
-    [t, location.search, reload],
+    [t, reload, roleScopes, roleText],
   );
   const create =
     canCreate && canAssign ? (
@@ -310,10 +381,14 @@ export default function UsersPage(): ReactElement {
         {t('settings.newUser')}
       </Button>
     ) : null;
-  const filtered = Boolean(params.get('q')) || status !== 'all';
+  const filtered =
+    Boolean(params.get('q') || roleScope || role) || status !== 'all';
   return (
     <>
       <PageContainer>
+        {returnTo && (
+          <BackButton to={returnTo}>{t('settings.backToSource')}</BackButton>
+        )}
         <PageHeader
           title={t('settings.users')}
           description={t('settings.usersDescription')}
@@ -321,6 +396,7 @@ export default function UsersPage(): ReactElement {
         />
         <div className='flex flex-wrap items-center gap-3'>
           <Input
+            ref={searchRef}
             className='w-full sm:max-w-xs'
             value={query}
             aria-label={t('settings.userSearch')}
@@ -348,14 +424,48 @@ export default function UsersPage(): ReactElement {
               ))}
             </SelectContent>
           </Select>
+          <Select
+            items={[
+              { value: 'all', label: t('settings.allRoles') },
+              ...roleChoices,
+            ]}
+            value={selectedRole}
+            onValueChange={(value) => {
+              if (!value) return;
+              setParams(
+                (old) => {
+                  const next = new URLSearchParams(old);
+                  next.delete('page');
+                  if (value === 'all') {
+                    next.delete('roleScope');
+                    next.delete('role');
+                  } else {
+                    const [scope, key] = JSON.parse(value) as [string, string];
+                    next.set('roleScope', scope);
+                    next.set('role', key);
+                  }
+                  return next;
+                },
+                { replace: true },
+              );
+            }}
+          >
+            <SelectTrigger aria-label={t('settings.roleFilter')}>
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent className='w-auto max-w-[min(var(--container-sm),var(--available-width))] min-w-(--anchor-width) [&_[data-slot=select-item]>:first-child]:whitespace-normal'>
+              {[
+                { value: 'all', label: t('settings.allRoles') },
+                ...roleChoices,
+              ].map((option) => (
+                <SelectItem key={option.value} value={option.value}>
+                  {option.label}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
           {filtered && (
-            <Button
-              variant='ghost'
-              onClick={() => {
-                setQuery('');
-                setParams({});
-              }}
-            >
+            <Button variant='ghost' onClick={clearFilters}>
               {t('settings.clear')}
             </Button>
           )}
@@ -365,6 +475,12 @@ export default function UsersPage(): ReactElement {
             {t('settings.loading')}
           </span>
         )}
+        {Boolean(roleScope) !== Boolean(role) && (
+          <p role='alert' className='text-sm text-destructive'>
+            {t('settings.roleFilterIncomplete')}
+          </p>
+        )}
+        <SettingsError error={options.error} retry={options.reload} />
         <SettingsError error={request.error} retry={request.reload} />
         {request.loading && !request.data ? (
           <SettingsLoading />
@@ -377,34 +493,8 @@ export default function UsersPage(): ReactElement {
               getRowId={(row) => row.id}
               manualPagination
               rowCount={request.data?.meta.total ?? 0}
-              paginationState={{ pageIndex: page - 1, pageSize }}
-              onPaginationChange={(updater) => {
-                const next =
-                  typeof updater === 'function'
-                    ? updater({ pageIndex: page - 1, pageSize })
-                    : updater;
-                setParams((old) => {
-                  const result = new URLSearchParams(old);
-                  result.set('page', String(next.pageIndex + 1));
-                  result.set('pageSize', String(next.pageSize));
-                  return result;
-                });
-              }}
+              {...tableState}
               manualSorting
-              sortingState={
-                params.get('order')
-                  ? [{ id: 'name', desc: params.get('order') === 'desc' }]
-                  : []
-              }
-              onSortingChange={(updater) => {
-                const previous = params.get('order')
-                  ? [{ id: 'name', desc: params.get('order') === 'desc' }]
-                  : [];
-                const next =
-                  typeof updater === 'function' ? updater(previous) : updater;
-                update('order', next[0] ? (next[0].desc ? 'desc' : 'asc') : '');
-              }}
-              pageSizeOptions={[20, 50, 100]}
               showSelectedCount={false}
               loading={request.loading}
             />
@@ -418,18 +508,16 @@ export default function UsersPage(): ReactElement {
               </EmptyTitle>
               <EmptyDescription>
                 {t(
-                  filtered ? 'settings.clearHint' : 'settings.usersDescription',
+                  filtered
+                    ? 'settings.clearHint'
+                    : canCreate && canAssign
+                      ? 'settings.usersDescription'
+                      : 'settings.usersReadOnlyEmpty',
                 )}
               </EmptyDescription>
               <EmptyContent>
                 {filtered ? (
-                  <Button
-                    variant='outline'
-                    onClick={() => {
-                      setQuery('');
-                      setParams({});
-                    }}
-                  >
+                  <Button variant='outline' onClick={clearFilters}>
                     {t('settings.clear')}
                   </Button>
                 ) : (

package/config.example.yml

@@ -77,15 +77,16 @@ auth:
     storeSessionInDatabase: true
 
 notification:
+  # provider remains a compatibility alias for type; both must match when supplied.
   channels:
     inbox:
-      provider: in-app
+      type: in-app
 
     # Uncomment and configure independent email Channels.
     # Values are read as written: ${NAME} is not expanded. To take a secret from the environment instead, map a
     # variable onto its path in env of server/config/notification.ts, such as SMTP_PASSWORD.
     # system-email:
-    #   provider: smtp
+    #   type: smtp
     #   host: smtp.example.com
     #   port: 587
     #   auth:
@@ -93,15 +94,15 @@ notification:
     #     pass: replace-with-the-smtp-password
     #   from: notifications@example.com
     # marketing-email:
-    #   provider: resend
+    #   type: resend
     #   apiKey: replace-with-the-resend-api-key
     #   from: marketing@example.com
 
     # ops-feishu:
-    #   provider: feishu-webhook
+    #   type: feishu-webhook
     #   webhookUrl: https://open.feishu.cn/open-apis/bot/v2/hook/replace-with-the-token
     # ops-dingtalk:
-    #   provider: dingtalk-webhook
+    #   type: dingtalk-webhook
     #   webhookUrl: https://oapi.dingtalk.com/robot/send?access_token=replace-with-the-token
 
 # DB_DIALECT, DB_HOST, DB_PORT, DB_DATABASE, DB_USERNAME, DB_PASSWORD, DB_SSL and DB_FILENAME override the main

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nocobase/app-template-default",
   "displayName": "Default Template",
-  "version": "1.0.0-beta.75",
+  "version": "1.0.0-beta.77",
   "type": "module",
   "prettier": "@nocobase/dev-config/prettier",
   "engines": {
@@ -9,7 +9,7 @@
   },
   "nocobase": {
     "templateKind": "app",
-    "defaultTemplateVersion": "1.0.0-beta.75"
+    "defaultTemplateVersion": "1.0.0-beta.77"
   },
   "devDependencies": {
     "@ai-sdk/react": "4.0.131",
@@ -72,9 +72,9 @@
     "tar": "^7.5.22",
     "@xyflow/react": "^12.11.5",
     "elkjs": "^0.10.2",
-    "@nocobase/app-client": "^4.0.0-beta.1",
+    "@nocobase/app-client": "^4.0.0-beta.2",
     "@nocobase/app-plugin-template-print": "0.0.2-beta.2",
-    "@nocobase/app-skills": "0.1.0-beta.43",
+    "@nocobase/app-skills": "0.1.0-beta.46",
     "@nocobase/app-testing": "0.1.0-beta.6",
     "@nocobase/app-websocket": "^0.1.0-beta.1",
     "@nocobase/dev-config": "0.1.0-beta.24",
@@ -139,23 +139,24 @@
     "@oclif/core": "^4.14.0",
     "better-auth": "1.7.5",
     "hono": "^4.13.2",
-    "@nocobase/app-plugin-agents": "^1.0.0-beta.17",
+    "@nocobase/app-plugin-agents": "^1.0.0-beta.19",
     "@nocobase/app-plugin-api-keys": "^1.0.0-beta.18",
-    "@nocobase/app-plugin-authentication": "^2.0.0-beta.12",
-    "@nocobase/app-plugin-authorization": "^1.0.0-beta.30",
+    "@nocobase/app-plugin-authorization": "^1.0.0-beta.31",
+    "@nocobase/app-plugin-authentication": "^2.0.0-beta.13",
     "@nocobase/app-plugin-database-explorer": "^1.0.0-beta.16",
     "@nocobase/app-plugin-file": "^1.0.0-beta.26",
-    "@nocobase/app-plugin-foundation": "^0.1.0-beta.0",
+    "@nocobase/app-plugin-foundation": "^0.1.0-beta.1",
     "@nocobase/app-plugin-i18n": "^1.0.0-beta.18",
-    "@nocobase/app-plugin-knowledge": "^0.1.0-beta.9",
-    "@nocobase/app-plugin-notification": "^1.0.0-beta.29",
-    "@nocobase/app-plugin-notification-in-app": "^1.0.0-beta.27",
-    "@nocobase/app-plugin-notification-providers": "^0.2.0-beta.14",
+    "@nocobase/app-plugin-knowledge": "^0.1.0-beta.10",
+    "@nocobase/app-plugin-mail": "^1.0.0-beta.16",
+    "@nocobase/app-plugin-notification": "^2.0.0-beta.0",
+    "@nocobase/app-plugin-notification-in-app": "^2.0.0-beta.0",
+    "@nocobase/app-plugin-notification-providers": "^1.0.0-beta.15",
     "@nocobase/app-plugin-scheduler": "^1.0.0-beta.19",
-    "@nocobase/app-plugin-users": "^2.0.0-beta.8",
-    "@nocobase/app-server": "^3.0.0-beta.1",
+    "@nocobase/app-plugin-users": "^2.0.0-beta.9",
+    "@nocobase/app-server": "^3.0.0-beta.3",
     "@nocobase/config": "^0.1.0-beta.3",
-    "@nocobase/db": "^1.0.0-beta.21",
+    "@nocobase/db": "^1.0.0-beta.22",
     "@nocobase/db-sqlite": "^0.1.0-beta.6",
     "@nocobase/service-provider": "^0.0.2-beta.2",
     "@nocobase/snowflake": "^1.0.0-beta.4",
@@ -169,8 +170,7 @@
     "@nocobase/i18n": "^2.0.0-beta.1",
     "@nocobase/caching": "^0.1.0-beta.3",
     "@nocobase/repository-input": "^0.1.0-beta.3",
-    "@nocobase/app-cli": "^1.0.0-beta.26",
-    "@nocobase/app-plugin-mail": "^1.0.0-beta.16",
+    "@nocobase/app-cli": "^1.0.0-beta.27",
     "@nocobase/realtime": "^0.1.0-beta.3"
   },
   "description": "NocoBase 3 application template with the standard product capabilities.",

package/server/config/app.ts

@@ -27,7 +27,7 @@ const app: AppConfigFactory<AppIdentityConfig> = defineAppConfig({
   },
   defaults: (runtime) => {
     const { routing } = runtime;
-    const publicBasePath = normalizeBasePath(routing.publicBasePath || '/main');
+    const publicBasePath = normalizeBasePath(routing.publicBasePath);
     return {
       name: routing.name || resolveAppNameFromBasePath(publicBasePath, 'main'),
       publicBasePath,

package/server/config/session.ts

@@ -4,7 +4,10 @@ import {
   type AppConfigFactory,
 } from '@nocobase/app-server/config';
 import type { AppSessionConfigInput } from '@nocobase/app-server/session';
-import { normalizeBasePath } from '@nocobase/app-server/support';
+import {
+  createAppCookieScope,
+  normalizeBasePath,
+} from '@nocobase/app-server/support';
 
 const session: AppConfigFactory<AppSessionConfigInput> = defineAppConfig({
   env: {
@@ -19,10 +22,9 @@ const session: AppConfigFactory<AppSessionConfigInput> = defineAppConfig({
     enabled: true,
     default: 'memory',
     cookie: {
-      name: 'nocobase_session',
-      // The application's own public base path, as `app.publicBasePath` resolves it: applications sharing an origin
-      // under different paths (`/crm`, `/acme`) each keep their own session cookie instead of overwriting one another's.
-      path: normalizeBasePath(routing.publicBasePath || '/main'),
+      name: `nocobase_session_${createAppCookieScope(routing.publicBasePath)}`,
+      // A distinct name also keeps a child application from reading a parent's cookie sent under an overlapping path.
+      path: normalizeBasePath(routing.publicBasePath) || '/',
       secure: env.NODE_ENV === 'production',
       httpOnly: true,
       sameSite: 'lax' as const,