@@ -0,0 +1,10 @@
+---
+'@object-ui/app-shell': patch
+---
+
+feat(app-shell): the first organization's create dialog opens with a default name, so one click continues
+
+Clause-②: no
+Metadata-protocol: none
+
+For a user with no organization yet — the dialog that opens right after sign-up — the organization name is prefilled from the user's e-mail. A work domain names the company from the domain's registrable label, capitalised (`jane@acme.com` → `Acme`, `jane@acme.co.uk` → `Acme`). A public mailbox domain (a closed list in code: gmail.com, outlook.com, qq.com, 163.com, proton.me and similar, subdomains included) names no company, so it takes the existing default organization name, "My Organization" / 「我的组织」 (`workspace.default`, already in every built-in pack; no translation key is added). An unlisted domain is treated as a work domain. The field stays editable, nothing is created until the user clicks, and creating a further organization still opens with an empty name. The e-mail domain rules live in a product-neutral app-shell util (`utils/emailDomain`), outside the organization pages.
@@ -8,10 +8,15 @@
  * owner can still change it later, in organization settings (`SettingsPage`'s
  * slug input).
  *
+ * For a user with no organization yet — the dialog that opens right after
+ * sign-up — the name is prefilled (`firstOrganizationName`), so one click
+ * continues; the field stays editable and nothing is created until the user
+ * clicks. Creating a further organization opens with an empty name.
+ *
  * @module
  */
 
-import { useState, useCallback, useEffect } from 'react';
+import { useState, useCallback, useEffect, useRef } from 'react';
 import {
   Dialog,
   DialogContent,
@@ -29,6 +34,7 @@ import { useObjectTranslation } from '@object-ui/i18n';
 import { Loader2 } from 'lucide-react';
 import { provisionProductionEnvironment } from './provisionEnvironment.js';
 import { resolveOrgErrorMessage } from './orgErrorMessage.js';
+import { emailDomain, isPublicMailboxDomain, registrableLabel } from '../../utils/emailDomain.js';
 
 /**
  * Convert a display name to a URL-friendly slug.
@@ -136,13 +142,45 @@ interface CreateWorkspaceDialogProps {
   onCreated?: (org: AuthOrganization) => void;
 }
 
+/**
+ * The name a user's FIRST organization is prefilled with: a work e-mail names
+ * the company from its domain's registrable label, capitalised
+ * (`jane@acme.com` → `Acme`); a public mailbox — or a label that would not
+ * read as typed (punycode, `xn--…`) — names no company, so it takes the
+ * generic default `fallback`. An address with no domain gives nothing.
+ */
+function firstOrganizationName(email: string | null | undefined, fallback: string): string {
+  const domain = emailDomain(email);
+  if (domain === undefined) return '';
+  if (isPublicMailboxDomain(domain)) return fallback;
+  const label = registrableLabel(domain);
+  if (!label || label.startsWith('xn--')) return fallback;
+  return label.charAt(0).toUpperCase() + label.slice(1);
+}
+
 export function CreateWorkspaceDialog({
   open,
   onOpenChange,
   onCreated,
 }: CreateWorkspaceDialogProps) {
   const { t } = useObjectTranslation();
-  const { createOrganization, getAuthConfig } = useAuth();
+  const { createOrganization, getAuthConfig, user, organizations, isOrganizationsLoading } = useAuth();
+
+  // Prefill only a FIRST organization (maintainer ruling objectstack-ai/cloud#3559
+  // A scopes the default to the naming step after sign-up): a known-empty list,
+  // not one still loading. A second organization derived from the same e-mail
+  // would only repeat the first one's name.
+  const isFirstOrganization =
+    Array.isArray(organizations) && organizations.length === 0 && !isOrganizationsLoading;
+  const defaultName =
+    isFirstOrganization && user
+      ? firstOrganizationName(user.email, t('workspace.default', { defaultValue: 'My Organization' }))
+      : '';
+  // Read when the dialog opens, never after: creating the organization moves
+  // `organizations` off zero mid-submit, and the name being submitted must not
+  // change under the user.
+  const defaultNameRef = useRef(defaultName);
+  defaultNameRef.current = defaultName;
 
   const [name, setName] = useState('');
   // The slug is not asked for (objectui#11659): it is derived from the name on
@@ -173,10 +211,10 @@ export function CreateWorkspaceDialog({
     };
   }, [open, getAuthConfig]);
 
-  // Reset form when dialog opens
+  // Reset form when dialog opens: the first-organization default, else empty.
   useEffect(() => {
     if (open) {
-      setName('');
+      setName(defaultNameRef.current);
       setError(null);
     }
   }, [open]);
 
@@ -17,19 +17,33 @@
  * `Intl.DateTimeFormat.prototype.resolvedOptions`, to `Asia/Shanghai`, so the
  * create call's argument does not depend on the zone of the machine running
  * the suite (objectui#11908).
+ *
+ * `t` answers the `defaultValue` unless a case sets `packLang`, in which case
+ * it answers that built-in pack's value; either way `{{x}}` is interpolated.
  */
 
 import '@testing-library/jest-dom/vitest';
 import { describe, it, expect, vi, beforeEach, afterEach, type MockInstance } from 'vitest';
 import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
 import { CreateWorkspaceDialog } from '../CreateWorkspaceDialog';
 import { provisionProductionEnvironment } from '../provisionEnvironment';
+import { builtInLocales } from '@object-ui/i18n/locales';
+
+/** The pack `t` reads from; `null` answers the call site's `defaultValue`. */
+let packLang: 'en' | 'zh' | null = null;
+function translate(key: string, options?: Record<string, unknown>): string {
+  const fromPack = packLang
+    ? key.split('.').reduce<unknown>((n, k) => (n as Record<string, unknown> | undefined)?.[k], builtInLocales[packLang])
+    : undefined;
+  const template = String(typeof fromPack === 'string' ? fromPack : (options?.defaultValue ?? key));
+  return template.replace(/\{\{(\w+)\}\}/g, (whole, name: string) =>
+    options && name in options ? String(options[name]) : whole,
+  );
+}
 
 vi.mock('@object-ui/i18n', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
-  useObjectTranslation: () => ({
-    t: (key: string, options?: Record<string, unknown>) => String(options?.defaultValue ?? key),
-  }),
+  useObjectTranslation: () => ({ t: translate }),
 }));
 
 vi.mock('../provisionEnvironment', () => ({
@@ -38,9 +52,11 @@ vi.mock('../provisionEnvironment', () => ({
 
 const createOrganization = vi.fn();
 const getAuthConfig = vi.fn();
+/** Extra `useAuth()` fields a case sets: `user`, `organizations`, `isOrganizationsLoading`. */
+let authState: Record<string, unknown> = {};
 vi.mock('@object-ui/auth', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
-  useAuth: () => ({ createOrganization, getAuthConfig }),
+  useAuth: () => ({ createOrganization, getAuthConfig, ...authState }),
 }));
 
 const provisionMock = vi.mocked(provisionProductionEnvironment);
@@ -59,6 +75,8 @@ beforeEach(() => {
   createOrganization.mockResolvedValue(NEW_ORG);
   provisionMock.mockResolvedValue({ id: 'env-1', hostname: 'os-abc123.objectstack.app' });
   browserZone = BROWSER_ZONE;
+  packLang = null;
+  authState = {};
   zoneReader = vi
     .spyOn(Intl.DateTimeFormat.prototype, 'resolvedOptions')
     .mockImplementation(function (this: Intl.DateTimeFormat) {
@@ -263,3 +281,101 @@ describe('CreateWorkspaceDialog', () => {
     });
   });
 });
+
+// Maintainer ruling objectstack-ai/cloud#3559 A: the dialog that opens right
+// after sign-up prefills a default name so one click continues; the field stays
+// editable, and nothing is created until the user clicks. A work e-mail names
+// the company; a public mailbox takes the existing `workspace.default` copy.
+describe('prefills a first organization from the e-mail (objectstack-ai/cloud#3559 A)', () => {
+  const GMAIL_USER = { id: 'u1', email: 'zhang.san@gmail.com', name: 'Zhang San' };
+  const WORK_USER = { id: 'u2', email: 'jane@acme.com', name: 'Jane Doe' };
+
+  function submitAsIs() {
+    fireEvent.submit(screen.getByTestId('create-workspace-dialog').querySelector('form') as HTMLFormElement);
+  }
+
+  it.each([
+    ['en', 'My Organization', 'my-organization'],
+    ['zh', '我的组织', null],
+  ] as const)('%s: a public-mailbox user sees the generic default and one click creates it', async (lang, expected, slug) => {
+    packLang = lang;
+    authState = { user: GMAIL_USER, organizations: [], isOrganizationsLoading: false };
+    render(<CreateWorkspaceDialog open onOpenChange={() => {}} onCreated={() => {}} />);
+    await settleAuthConfig();
+
+    expect(screen.getByTestId('workspace-name-input')).toHaveValue(expected);
+    expect(createOrganization).not.toHaveBeenCalled();
+    submitAsIs();
+
+    await waitFor(() => expect(createOrganization).toHaveBeenCalledTimes(1));
+    const sent = createOrganization.mock.calls[0][0] as { name: string; slug: string };
+    expect(sent.name).toBe(expected);
+    if (slug) expect(sent.slug).toBe(slug);
+    else expect(sent.slug).toMatch(/^workspace-[0-9a-z]+$/);
+    await waitFor(() => expect(provisionMock).toHaveBeenCalledWith({ organizationId: 'org-123', displayName: expected }));
+  });
+
+  it('a public mailbox subdomain (vip.qq.com) and a punycode work label take the generic default', () => {
+    packLang = 'zh';
+    for (const email of ['li@vip.qq.com', 'li@xn--fiqs8s.com']) {
+      authState = { user: { ...GMAIL_USER, email }, organizations: [], isOrganizationsLoading: false };
+      const { unmount } = render(<CreateWorkspaceDialog open onOpenChange={() => {}} />);
+      expect(screen.getByTestId('workspace-name-input'), email).toHaveValue('我的组织');
+      unmount();
+    }
+  });
+
+  it('a work-domain user sees the company name in both locales', async () => {
+    for (const lang of ['en', 'zh'] as const) {
+      packLang = lang;
+      authState = { user: WORK_USER, organizations: [], isOrganizationsLoading: false };
+      const { unmount } = render(<CreateWorkspaceDialog open onOpenChange={() => {}} />);
+      expect(screen.getByTestId('workspace-name-input')).toHaveValue('Acme');
+      unmount();
+    }
+    for (const [email, company] of [
+      ['jane@mail.acme.co.uk', 'Acme'],
+      ['jane@notgmail.com', 'Notgmail'],
+    ] as const) {
+      authState = { user: { ...WORK_USER, email }, organizations: [], isOrganizationsLoading: false };
+      const { unmount } = render(<CreateWorkspaceDialog open onOpenChange={() => {}} />);
+      expect(screen.getByTestId('workspace-name-input'), email).toHaveValue(company);
+      unmount();
+    }
+  });
+
+  it('the default stays editable: what the user types is what is created', async () => {
+    authState = { user: WORK_USER, organizations: [], isOrganizationsLoading: false };
+    render(<CreateWorkspaceDialog open onOpenChange={() => {}} />);
+    await settleAuthConfig();
+
+    fillAndSubmit('Acme Robotics');
+
+    await waitFor(() => expect(createOrganization).toHaveBeenCalledTimes(1));
+    expect((createOrganization.mock.calls[0][0] as { name: string }).name).toBe('Acme Robotics');
+  });
+
+  it.each([
+    ['already has an organization', { organizations: [NEW_ORG], isOrganizationsLoading: false }],
+    ['has an organization list still loading', { organizations: [], isOrganizationsLoading: true }],
+    ['has no organization list at all', {}],
+  ] as const)('control: a user who %s opens with an empty name', async (_label, orgState) => {
+    authState = { user: WORK_USER, ...orgState };
+    render(<CreateWorkspaceDialog open onOpenChange={() => {}} />);
+    await settleAuthConfig();
+
+    expect(screen.getByTestId('workspace-name-input')).toHaveValue('');
+    expect(screen.getByTestId('workspace-create-submit')).toBeDisabled();
+  });
+
+  it('the name does not change while open when the organization list moves off zero', async () => {
+    authState = { user: WORK_USER, organizations: [], isOrganizationsLoading: false };
+    const { rerender } = render(<CreateWorkspaceDialog open onOpenChange={() => {}} />);
+    expect(screen.getByTestId('workspace-name-input')).toHaveValue('Acme');
+
+    authState = { user: WORK_USER, organizations: [NEW_ORG], isOrganizationsLoading: false };
+    rerender(<CreateWorkspaceDialog open onOpenChange={() => {}} />);
+
+    expect(screen.getByTestId('workspace-name-input')).toHaveValue('Acme');
+  });
+});
@@ -0,0 +1,93 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
+/**
+ * emailDomain — the address parse, the closed public-mailbox list and the
+ * registrable-label rule.
+ */
+
+import { describe, it, expect } from 'vitest';
+import {
+  emailDomain,
+  isPublicMailboxDomain,
+  registrableLabel,
+  PUBLIC_MAILBOX_DOMAINS,
+} from '../emailDomain';
+
+describe('emailDomain', () => {
+  it.each([
+    ['jane@acme.com', 'acme.com'],
+    ['  Jane@ACME.COM ', 'acme.com'],
+    ['jane@acme.com.', 'acme.com'],
+    // The LAST at sign separates the domain.
+    ['"a@b"@acme.com', 'acme.com'],
+  ])('%s → %s', (email, expected) => {
+    expect(emailDomain(email)).toBe(expected);
+  });
+
+  it.each([
+    ['no e-mail', undefined],
+    ['null', null],
+    ['an empty e-mail', ''],
+    ['no domain', 'jane@'],
+    ['no local part', '@acme.com'],
+    ['no at sign', 'jane.acme.com'],
+    ['a domain that is only a dot', 'jane@.'],
+  ])('%s → undefined', (_label, email) => {
+    expect(emailDomain(email)).toBeUndefined();
+  });
+});
+
+describe('isPublicMailboxDomain', () => {
+  it.each([...PUBLIC_MAILBOX_DOMAINS])('%s is public', (domain) => {
+    expect(isPublicMailboxDomain(domain)).toBe(true);
+  });
+
+  it('the closed list carries the common providers by name', () => {
+    for (const named of [
+      'gmail.com',
+      'outlook.com',
+      'hotmail.com',
+      'yahoo.com',
+      'icloud.com',
+      'qq.com',
+      '163.com',
+      '126.com',
+      'foxmail.com',
+      'proton.me',
+    ]) {
+      expect(PUBLIC_MAILBOX_DOMAINS.has(named), named).toBe(true);
+    }
+  });
+
+  it('a subdomain of a listed provider is that provider (vip.qq.com)', () => {
+    expect(isPublicMailboxDomain('vip.qq.com')).toBe(true);
+  });
+
+  it.each([
+    // Merely ENDING in a listed name is not that provider.
+    'notgmail.com',
+    'acme.com',
+    'mail.acme.co.uk',
+  ])('%s is not public', (domain) => {
+    expect(isPublicMailboxDomain(domain)).toBe(false);
+  });
+});
+
+describe('registrableLabel', () => {
+  it.each([
+    ['acme.com', 'acme'],
+    ['mail.acme.com', 'acme'],
+    ['a.b.acme.com', 'acme'],
+    ['acme.io', 'acme'],
+    ['acme.co.uk', 'acme'],
+    ['acme.com.cn', 'acme'],
+    ['acme.com.au', 'acme'],
+    ['eu.acme.co.jp', 'acme'],
+    ['acme-labs.com', 'acme-labs'],
+    // `co` under a three-letter TLD is an ordinary label, not a registry pair.
+    ['acme.co.com', 'co'],
+    ['localhost', undefined],
+  ])('%s → %s', (domain, expected) => {
+    expect(registrableLabel(domain)).toBe(expected);
+  });
+});