portal-mojo 0.2.19 → 0.2.21

package/src/admin/dns/CertificateRequestDialog.tsx

@@ -1,9 +1,13 @@
-import { useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
 import { TagInput, toast } from '../../ui';
 import { requestCertificate, useAcmeDelegations, useDnsCapabilities } from './api';
 import { deriveCertificateReadiness, validateCertificateNames } from './certificate-data';
-import { DnsCredentialModel, DomainModel, type CertificateRow, type DomainRow } from './models';
+import { getAuthSessionRevision, getAuthSnapshot, hasPermission, requestFreshAuth, useMe } from '../../client/runtime';
+import { confirmShared } from './SharedValidationDialog';
+import { invalidateValidation, requestWildcard, useValidationPlan } from './shared-validation-api';
+import { SharedValidationError } from './shared-validation-data';
+import { CertificateModel, DNS_MANAGE_PERMISSIONS, DnsCredentialModel, DomainModel, type CertificateRow, type DomainRow } from './models';
 
 function relationId(value: DomainRow['credential']): number | null {
     if (typeof value === 'number') return value;
@@ -15,6 +19,7 @@ export function CertificateRequestDialog({ close, domain: fixedDomain }: {
     domain?: DomainRow;
 }) {
     const queryClient = useQueryClient();
+    const { data: me } = useMe();
     const domains = DomainModel.useList({ status: 'active', size: 200, sort: 'name' }, { enabled: fixedDomain == null });
     const [domainId, setDomainId] = useState<number | null>(fixedDomain?.id ?? null);
     const domainQuery = DomainModel.useOne(domainId);
@@ -24,6 +29,15 @@ export function CertificateRequestDialog({ close, domain: fixedDomain }: {
     const delegations = useAcmeDelegations(domain?.id ?? null, domain != null);
     const credentialId = domain ? relationId(domain.credential) : null;
     const credential = DnsCredentialModel.useOne(credentialId);
+    const sharedPlan = useValidationPlan(domain ? { domain: domain.id } : null);
+    const explicitShared = sharedPlan.data?.connection?.mode === 'shared';
+    const sharedFlight = useRef(false);
+    const sharedOwner = useRef<AbortController | null>(null);
+    const [sharedRefreshRequired, setSharedRefreshRequired] = useState(false);
+    const sharedRevision = getAuthSessionRevision();
+    const sharedIdentity = JSON.stringify([domainId, sharedRevision, me?.id, hasPermission(me ?? null, DNS_MANAGE_PERMISSIONS, null)]);
+    const currentIdentity = useRef(sharedIdentity); currentIdentity.current = sharedIdentity;
+    useEffect(() => { const abort = new AbortController(); sharedOwner.current = abort; return () => abort.abort(); }, [sharedIdentity]);
     const [namesCsv, setNamesCsv] = useState('');
     const [names, setNames] = useState<string[]>([]);
     const [submitting, setSubmitting] = useState(false);
@@ -45,7 +59,30 @@ export function CertificateRequestDialog({ close, domain: fixedDomain }: {
 
     const submit = async (event: React.FormEvent) => {
         event.preventDefault();
-        if (!domain || !readiness?.ready || validation.errors.length || submitting) return;
+        if (explicitShared) {
+            const r = sharedPlan.data;
+            if (!domain || !r?.capabilities.can_request || !r.connection || !r.alias.target || sharedPlan.error || sharedPlan.loading || sharedFlight.current || sharedRefreshRequired || !hasPermission(me ?? null, DNS_MANAGE_PERMISSIONS, null)) return;
+            sharedFlight.current = true; setSubmitting(true); setError(null);
+            const identity = sharedIdentity, uid = getAuthSnapshot().uid, revision = getAuthSessionRevision();
+            const signal = sharedOwner.current?.signal;
+            const beforeSend = () => { if (signal?.aborted || currentIdentity.current !== identity || getAuthSnapshot().uid !== uid || getAuthSessionRevision() !== revision) throw new SharedValidationError('access'); };
+            let submitted = false;
+            try {
+                const confirmed = await confirmShared({ title: 'Request wildcard certificate', message: <>Request a local certificate for <code>{r.profile.names.join(', ')}</code> through the verified shared validation target <code>{r.alias.target}</code>? This deployment keeps its own private key.</>, confirmText: 'Request wildcard', signal });
+                if (!confirmed) return;
+                beforeSend(); submitted = true;
+                const result = await requestWildcard(r.connection.id, { domain: domain.id }, r.alias.target, { signal, beforeSend });
+                beforeSend();
+                if (result.certificate) { const row = await CertificateModel.fetchOne(queryClient, result.certificate.id); beforeSend(); close(row); }
+            } catch (reason) {
+                if (!signal?.aborted) { setError(reason instanceof SharedValidationError ? reason.message : 'Shared wildcard request could not be completed. Refresh before retrying.'); if (reason instanceof SharedValidationError && reason.kind === 'reauth') { setSharedRefreshRequired(true); await requestFreshAuth(); } }
+            } finally {
+                if (submitted) { await invalidateValidation(queryClient); if (!signal?.aborted) setSharedRefreshRequired(!(await sharedPlan.refresh())); }
+                sharedFlight.current = false; setSubmitting(false);
+            }
+            return;
+        }
+        if (!domain || !readiness?.ready || validation.errors.length || submitting || (sharedPlan.error && sharedPlan.error.kind !== 'unsupported')) return;
         setSubmitting(true);
         setError(null);
         try {
@@ -69,7 +106,7 @@ export function CertificateRequestDialog({ close, domain: fixedDomain }: {
                 {(domains.data?.rows ?? []).map((row) => <option key={row.id} value={row.id}>{row.name}</option>)}
             </select>
         </label>}
-        <label className="field">
+        {explicitShared ? <div className="dns-cert-readiness"><strong>Fixed shared wildcard profile</strong><code>{sharedPlan.data!.profile.names.join(', ')}</code><span>Only the backend-authorized apex and wildcard can be requested through this connection.</span><span>{sharedPlan.data!.next_action.code.replaceAll('_', ' ')}</span><button className="btn" type="button" disabled={submitting || sharedPlan.loading} onClick={() => void sharedPlan.refresh().then((r) => { setSharedRefreshRequired(!r); if (r) setError(null); })}>Refresh shared readiness</button></div> : <label className="field">
             <span className="field-label">Names</span>
             <TagInput
                 name="certificate_names"
@@ -81,21 +118,22 @@ export function CertificateRequestDialog({ close, domain: fixedDomain }: {
                 disabled={!domain || submitting}
             />
             <span className="field-help">Leave empty for the domain apex plus its wildcard. Every SAN must stay inside the selected zone.</span>
-        </label>
+        </label>}
         {!!validation.errors.length && <div className="dns-errors" role="alert">{validation.errors.map((message) => <div key={message}>{message}</div>)}</div>}
         {loadingReadiness && <div className="dns-cert-readiness dim"><i className="bi bi-arrow-repeat spin" /> Checking issuance readiness…</div>}
-        {readiness && <div className={`dns-cert-readiness${readiness.ready ? ' is-ready' : ' is-blocked'}`}>
+        {!explicitShared && readiness && <div className={`dns-cert-readiness${readiness.ready ? ' is-ready' : ' is-blocked'}`}>
             <strong>{readiness.label}</strong>
             {readiness.reason && <span>{readiness.reason}</span>}
         </div>}
         {capabilities.data?.acme.staging && <div className="dns-provider-note">
             <strong>Current ACME configuration: staging.</strong> New certificates are not publicly trusted. This flag is current configuration, not historical provenance for existing certificates.
         </div>}
+        {sharedPlan.error && sharedPlan.error.kind !== 'unsupported' && <div className="dns-errors" role="alert">{sharedPlan.error.message}</div>}
         {capabilities.error && <div className="dns-errors">{capabilities.error.message}</div>}
         {error && <div className="dns-errors" role="alert">{error}</div>}
         <div className="modal-actions">
             <button className="btn" type="button" disabled={submitting} onClick={() => close(null)}>Cancel</button>
-            <button className="btn btn-primary" type="submit" disabled={!domain || !readiness?.ready || validation.errors.length > 0 || submitting}>
+            <button className="btn btn-primary" type="submit" disabled={!domain || submitting || sharedPlan.loading || (explicitShared ? !sharedPlan.data?.capabilities.can_request || !!sharedPlan.error || sharedRefreshRequired : !readiness?.ready || validation.errors.length > 0 || (!!sharedPlan.error && sharedPlan.error.kind !== 'unsupported'))}>
                 {submitting ? 'Requesting…' : 'Request certificate'}
             </button>
         </div>

package/src/admin/dns/DomainDetail.tsx

@@ -6,7 +6,12 @@ import { providerLabel } from './data';
 import { useDnsDomainLinks } from './domain-links';
 import { DnsRecordsPanel } from './DnsRecordsPanel';
 import { DomainCertificatesSection } from './DomainCertificatesSection';
-import { DomainModel } from './models';
+import { SharedValidationPanel } from './SharedValidationPanel';
+import { openSharedValidation } from './SharedValidationDialog';
+import { useValidationPlan } from './shared-validation-api';
+import { domainRecordsHref, domainScopeLabel, dnsAdminMount, supportsDomainRecords } from './domain-navigation';
+import { redactRegistrarError } from './purchase-data';
+import { DNS_MANAGE_PERMISSIONS, DNS_VIEW_PERMISSIONS, DomainModel } from './models';
 
 export function DomainDetail({ id, onClose }: { id: number; onClose: () => void }) {
     const query = DomainModel.useOne(id);
@@ -15,6 +20,7 @@ export function DomainDetail({ id, onClose }: { id: number; onClose: () => void
     const navigate = useNavigate();
     const location = useLocation();
     const domain = query.data;
+    const shared = useValidationPlan(domain ? { domain: domain.id } : null);
     const group = typeof domain?.group === 'number' ? domain.group : domain?.group?.id ?? null;
     const capabilities = useDnsCapabilities(group, { enabled: !!domain });
     if (query.isPending) return <div className="modal-pad dim">Loading domain…</div>;
@@ -26,16 +32,20 @@ export function DomainDetail({ id, onClose }: { id: number; onClose: () => void
         onClose();
         navigate(`${mount}/dns/${route.replace(/^\/?dns\//, '').replace(/^\//, '')}`);
     };
-    const groupLabel = typeof domain.group === 'object' ? domain.group?.name ?? 'Platform' : domain.group ?? 'Platform';
+    const groupLabel = domainScopeLabel(domain.group);
+    const canManage = hasPermission(me ?? null, DNS_MANAGE_PERMISSIONS, null);
+    const openDestination = (href: string) => { onClose(); navigate(href); };
     const credential = typeof domain.credential === 'object' ? domain.credential : null;
     return <DetailView
-        icon="bi-globe2" title={domain.name} subtitle={`${providerLabel(domain.provider)}${domain.hosted_zone_id ? ` · ${domain.hosted_zone_id}` : ''}`}
+        icon="bi-globe2" title={domain.name} subtitle={providerLabel(domain.provider)}
         chips={[{ text: domain.status, tone: fmt.inferTone(domain.status) }, ...(domain.verified ? [{ text: 'Verified', tone: 'success' as const }] : [])]}
         sections={[
-            { key: 'overview', label: 'Overview', icon: 'bi-grid-1x2', render: () => <div className="dns-domain-overview"><Eyebrow>Domain</Eyebrow><FlatRow label="Name"><code>{domain.name}</code></FlatRow><FlatRow label="Provider">{providerLabel(domain.provider)}</FlatRow><FlatRow label="Status">{domain.status}</FlatRow><FlatRow label="Group">{groupLabel}</FlatRow>{domain.hosted_zone_id && <FlatRow label="Hosted zone"><code>{domain.hosted_zone_id}</code></FlatRow>}<FlatRow label="Registered">{fmt.date(domain.registered_on)}</FlatRow><FlatRow label="Expires">{fmt.date(domain.expires)}</FlatRow><FlatRow label="Verified">{domain.verified ? 'Yes' : 'No'}</FlatRow><FlatRow label="Auto-renew">{domain.auto_renew ? 'Enabled' : 'Disabled'}</FlatRow><FlatRow label="WHOIS privacy">{domain.privacy ? 'Enabled' : 'Disabled'}</FlatRow><FlatRow label="Credential">{credential ? `${credential.name} · ${credential.is_active && credential.verified ? 'usable' : 'unavailable'}` : '—'}</FlatRow>{domain.last_error && <div className="dns-error">{domain.last_error}</div>}{domain.provider === 'godaddy' && <div className="dns-provider-note">DNS is managed here; purchase, renewal, privacy, and WHOIS remain in the GoDaddy account.</div>}{domain.provider === 'mojo' && <div className="dns-blocked">Mojo is certificate-only and cannot use generic DNS CRUD.</div>}{availableLinks.length > 0 && <><Eyebrow>Related</Eyebrow><div className="dns-domain-links">{availableLinks.map((link) => <button className="btn" type="button" key={link.key} onClick={() => navigateLink(typeof link.route === 'function' ? link.route(domain) : link.route)}><i className={`bi ${link.icon}`} /> {link.label}</button>)}</div></>}</div> },
+            { key: 'overview', label: 'Overview', icon: 'bi-grid-1x2', render: () => <div className="dns-domain-overview"><div className="domains-overview-actions">{supportsDomainRecords(domain.provider) && <button className="btn btn-primary" onClick={() => openDestination(domainRecordsHref(location.pathname, domain.id))}>DNS Records <i className="bi bi-arrow-right" /></button>}{canManage && domain.provider === 'route53' && <button className="btn" onClick={() => void import('./DomainRegistrarSettings').then(({ showDomainRegistrarSettings }) => showDomainRegistrarSettings(domain))}>Registrar settings</button>}{hasPermission(me ?? null, DNS_VIEW_PERMISSIONS, null) && <button className="btn" onClick={() => openDestination(`${dnsAdminMount(location.pathname)}/edge/vhosts`)}>Serving <i className="bi bi-arrow-right" /></button>}</div><Eyebrow>Domain</Eyebrow><FlatRow label="Scope">{groupLabel}</FlatRow><FlatRow label="Expires">{fmt.date(domain.expires)}</FlatRow><FlatRow label="Auto-renew">{domain.auto_renew ? 'Enabled' : 'Disabled'}</FlatRow><FlatRow label="WHOIS privacy">{domain.privacy ? 'Enabled' : 'Disabled'}</FlatRow><details className="ops-details"><summary>Registration details</summary>{domain.hosted_zone_id && <FlatRow label="Hosted zone"><code>{domain.hosted_zone_id}</code></FlatRow>}<FlatRow label="Registered">{fmt.date(domain.registered_on)}</FlatRow><FlatRow label="Credential">{credential ? `${credential.name} · ${credential.is_active && credential.verified ? 'usable' : 'unavailable'}` : '—'}</FlatRow></details>{domain.last_error && <div className="dns-error">{redactRegistrarError(domain.last_error)}</div>}{domain.provider === 'godaddy' && <div className="dns-provider-note">DNS is managed here; purchase, renewal, privacy, and WHOIS remain in the GoDaddy account.</div>}{domain.provider === 'mojo' && <div className="dns-blocked">Mojo is certificate-only and cannot use generic DNS CRUD.</div>}{availableLinks.length > 0 && <><Eyebrow>Related</Eyebrow><div className="dns-domain-links">{availableLinks.filter((link) => link.key !== 'records' || supportsDomainRecords(domain.provider)).map((link) => <button className="btn" type="button" key={link.key} onClick={() => navigateLink(typeof link.route === 'function' ? link.route(domain) : link.route)}><i className={`bi ${link.icon}`} /> {link.label}</button>)}</div></>}</div> },
+            { key: 'validation', label: 'Advanced validation', icon: 'bi-diagram-2', render: () => <SharedValidationPanel domain={domain} /> },
             { key: 'records', label: 'DNS Records', icon: 'bi-list-columns', render: () => <DnsRecordsPanel domain={domain} /> },
             { key: 'certificates', label: 'Certificates', icon: 'bi-patch-check', render: () => <DomainCertificatesSection domain={domain} /> },
         ]}
         initialSection="overview" onClose={onClose}
+        contextMenu={canManage && shared.data?.capabilities.group_choices ? [{ label: 'Set up shared validation', icon: 'bi-diagram-2', onSelect: () => void openSharedValidation(domain) }] : []}
     />;
 }

package/src/admin/dns/DomainOnboardingContent.tsx

@@ -0,0 +1,44 @@
+import { useRef, useState } from 'react';
+import { useQueryClient } from '@tanstack/react-query';
+import { hasPermission, useMe } from '../../client/runtime';
+import { toast } from '../../ui';
+import { adoptHouseDomain } from './api';
+import { DNS_MANAGE_PERMISSIONS, DomainModel } from './models';
+import { normalizePurchaseDomain, redactRegistrarError } from './purchase-data';
+import { DomainPurchaseWizard } from './DomainPurchaseWizard';
+import { DomainRegisterExisting } from './DomainRegisterExisting';
+
+export type OnboardingMode = 'menu' | 'register' | 'purchase' | 'adopt';
+
+export function DomainOnboardingDialog({ close, setBusyGate, initialMode = 'menu' }: { close: () => void; setBusyGate: (busy: boolean) => void; initialMode?: OnboardingMode }) {
+    const { data: me } = useMe(); const queryClient = useQueryClient();
+    const [mode, setMode] = useState<OnboardingMode>(initialMode);
+    const [name, setName] = useState(''); const [review, setReview] = useState<string | null>(null);
+    const [busy, setBusy] = useState(false); const [attempted, setAttempted] = useState(false); const [error, setError] = useState('');
+    const inFlight = useRef(false);
+    const canManage = hasPermission(me ?? null, DNS_MANAGE_PERMISSIONS, null);
+    const prepareAdoption = () => {
+        if (inFlight.current || attempted || me?.is_superuser !== true) return;
+        try { setReview(normalizePurchaseDomain(name)); setError(''); setBusyGate(true); }
+        catch (reason) { setError(redactRegistrarError(reason)); }
+    };
+    const cancelReview = () => { if (inFlight.current) return; setReview(null); setBusyGate(false); };
+    const adopt = async () => {
+        if (inFlight.current || attempted || !review || me?.is_superuser !== true || !canManage) return;
+        inFlight.current = true; setBusy(true); setBusyGate(true); setAttempted(true); setError('');
+        try { const domain = await adoptHouseDomain({ domain: review }); await DomainModel.invalidate(queryClient); toast.success(`${domain.name} adopted at Platform scope`); close(); }
+        catch (reason) { await DomainModel.invalidate(queryClient); setError(`${redactRegistrarError(reason)} Review the domain inventory before another adoption.`); }
+        finally { inFlight.current = false; setBusy(false); setReview(null); setBusyGate(false); }
+    };
+    if (!me) return <div className="modal-pad dim">Checking DNS authority…</div>;
+    if (!canManage) return <div className="modal-pad domain-onboarding"><h2 className="modal-title">DNS management required</h2><p className="dim">A global DNS management permission is required.</p><button className="btn" onClick={close}>Close</button></div>;
+    if (mode === 'purchase') return <div className="modal-pad domain-onboarding"><h2 className="modal-title">Buy domain</h2><DomainPurchaseWizard onDone={close} onBusyChange={setBusyGate} /></div>;
+    if (mode === 'register') return <DomainRegisterExisting close={close} back={() => setMode('menu')} setBusyGate={setBusyGate} />;
+    if (mode === 'adopt') {
+        if (me.is_superuser !== true) return <div className="modal-pad domain-onboarding"><h2 className="modal-title">Platform superuser required</h2><button className="btn" onClick={close}>Close</button></div>;
+        return <div className="modal-pad domain-onboarding"><h2 className="modal-title">Adopt a House domain</h2><p className="dim">Adopt one existing public hosted zone at Platform scope. No account discovery, new zone, or tenant assignment.</p>{error && <div className="form-alert" role="alert">{error}</div>}
+            {review ? <div className="dns-quote-card"><h3>Review exact adoption</h3><div><span>Domain</span><code>{review}</code></div><div><span>Scope</span><b>Platform</b></div><div className="modal-actions"><button className="btn" disabled={busy} onClick={cancelReview}>Cancel review</button><button className="btn btn-primary" disabled={busy} onClick={() => void adopt()}>{busy ? 'Adopting…' : 'Confirm adoption'}</button></div></div> : <><label className="field"><span className="field-label">Existing House domain</span><input className="input" value={name} disabled={busy || attempted} onChange={(event) => setName(event.target.value)} /></label><div className="modal-actions"><button className="btn" disabled={busy} onClick={attempted ? close : () => setMode('menu')}>{attempted ? 'Close and review inventory' : 'Back'}</button><button className="btn btn-primary" disabled={busy || attempted || !name.trim()} onClick={prepareAdoption}>Review adoption</button></div></>}
+        </div>;
+    }
+    return <div className="modal-pad domain-onboarding"><h2 className="modal-title">Add a domain</h2><p className="dim">Choose one explicit workflow.</p><div className="dns-onboarding-options"><button className="panel panel-pad" onClick={() => setMode('register')}><i className="bi bi-globe2" /><b>Register existing</b><span>Prove ownership of one GoDaddy domain using a verified group credential.</span></button>{me.is_superuser === true && <button className="panel panel-pad" onClick={() => setMode('adopt')}><i className="bi bi-house-add" /><b>Adopt a House domain</b><span>Type an existing public zone name; keep it at Platform scope.</span></button>}<button className="panel panel-pad" onClick={() => setMode('purchase')}><i className="bi bi-cart-check" /><b>Buy domain</b><span>Search, quote, confirm once, and reconcile against the durable ledger.</span></button></div><div className="modal-actions"><button className="btn" onClick={close}>Cancel</button></div></div>;
+}

package/src/admin/dns/DomainOnboardingDialog.tsx

@@ -1,27 +1,8 @@
-import { useState } from 'react';
-import { useQueryClient } from '@tanstack/react-query';
-import { useMe } from '../../client/runtime';
-import { modal, toast } from '../../ui';
-import { adoptHouseDomain } from './api';
-import { DomainModel } from './models';
-import { normalizePurchaseDomain, redactRegistrarError } from './purchase-data';
-import { DomainPurchaseWizard } from './DomainPurchaseWizard';
+import { modal } from '../../ui';
+import { DomainOnboardingDialog, type OnboardingMode } from './DomainOnboardingContent';
 
-function DomainOnboardingDialog({ close, setBusyGate }: { close: () => void; setBusyGate: (busy: boolean) => void }) {
-    const { data: me } = useMe(); const queryClient = useQueryClient();
-    const [mode, setMode] = useState<'menu' | 'purchase' | 'adopt'>('menu'); const [name, setName] = useState(''); const [busy, setBusy] = useState(false); const [error, setError] = useState('');
-    const adopt = async () => {
-        if (busy || me?.is_superuser !== true) return; setBusy(true); setBusyGate(true); setError('');
-        try { const domain = await adoptHouseDomain({ domain: normalizePurchaseDomain(name) }); await DomainModel.invalidate(queryClient); toast.success(`${domain.name} adopted at House scope`); close(); }
-        catch (reason) { setError(redactRegistrarError(reason)); }
-        finally { setBusy(false); setBusyGate(false); }
-    };
-    if (mode === 'purchase') return <div className="modal-pad"><h2 className="modal-title">Purchase a domain</h2><DomainPurchaseWizard onDone={close} onBusyChange={setBusyGate} /></div>;
-    if (mode === 'adopt') return <div className="modal-pad"><h2 className="modal-title">Adopt a House domain</h2><p className="dim">Manual, exact-name adoption only. This does not enumerate the House account and creates no tenant assignment.</p>{error && <div className="form-alert">{error}</div>}<label className="field"><span className="field-label">Existing House domain</span><input className="input" value={name} disabled={busy} onChange={(event) => setName(event.target.value)} /></label><div className="modal-actions"><button className="btn" disabled={busy} onClick={() => setMode('menu')}>Back</button><button className="btn btn-primary" disabled={busy || !name.trim()} onClick={() => void adopt()}>{busy ? 'Adopting…' : 'Adopt exact name'}</button></div></div>;
-    return <div className="modal-pad"><h2 className="modal-title">Add a domain</h2><p className="dim">Choose one explicit workflow.</p><div className="dns-onboarding-options"><button className="panel panel-pad" onClick={() => setMode('purchase')}><i className="bi bi-cart-check" /><b>Purchase a new domain</b><span>Search, quote, confirm once, and reconcile against the durable ledger.</span></button>{me?.is_superuser === true && <button className="panel panel-pad" onClick={() => setMode('adopt')}><i className="bi bi-house-add" /><b>Adopt a House domain</b><span>Type an existing name manually; no account discovery.</span></button>}</div><div className="modal-actions"><button className="btn" onClick={close}>Cancel</button></div></div>;
-}
-
-export function showDomainOnboarding(): Promise<unknown> {
+/** No-argument callers retain the original menu. */
+export function showDomainOnboarding({ initialMode = 'menu' }: { initialMode?: OnboardingMode } = {}): Promise<unknown> {
     let busy = false;
-    return modal.open((close) => <DomainOnboardingDialog close={() => close(null)} setBusyGate={(value) => { busy = value; }} />, { size: 'lg', canDismiss: () => !busy });
+    return modal.open((close) => <DomainOnboardingDialog initialMode={initialMode} close={() => close(null)} setBusyGate={(value) => { busy = value; }} />, { size: 'lg', canDismiss: () => !busy });
 }

package/src/admin/dns/DomainPurchaseWizard.tsx

@@ -89,7 +89,7 @@ export function DomainPurchaseWizard({ onDone, onBusyChange }: { onDone?: () =>
                 inFlight.current = true; attempted.current = true; const accepted = ++generation.current;
                 const token = transient.token; quoteRef.current = null;
                 try {
-                    const acknowledgement = await purchaseDomain({ group: transient.identity.group, purchase: transient.identity.purchase, confirm_token: token });
+                    const acknowledgement = await purchaseDomain({ group: transient.identity.group, purchase: transient.identity.purchase, confirm_token: token, confirm_domain: transient.identity.domain, confirm_price: transient.identity.price });
                     const settled = await pollPurchaseLedger({ purchase: acknowledgement.purchase, isCurrent: () => generation.current === accepted, fetch: fetchPurchaseDetail });
                     if (!settled) setTerminalMessage(`Purchase acknowledgement was received, but bounded polling did not settle. ${PURCHASE_MAY_HAVE_MOVED}`);
                     else { setReceipt(settled); setTerminalMessage(settled.status === 'completed' ? 'Registration completed.' : `${redactRegistrarError(settled.error)} ${PURCHASE_MAY_HAVE_MOVED}`); }

package/src/admin/dns/DomainRegisterExisting.tsx

@@ -0,0 +1,63 @@
+import { useRef, useState } from 'react';
+import { useQueryClient } from '@tanstack/react-query';
+import { CollectionSelect, toast } from '../../ui';
+import { OperationsHelp } from '../core/OperationsHelp';
+import { DNS_GROUP_CHOICE_ENDPOINT, registerExistingDomain } from './api';
+import { DnsCredentialModel, DomainModel, type DnsCredentialRow, type DnsGroupChoice } from './models';
+import { normalizePurchaseDomain, redactRegistrarError } from './purchase-data';
+
+export function usableRegistrationCredential(row: DnsCredentialRow | null, group: number): row is DnsCredentialRow {
+    return !!row && row.provider === 'godaddy' && row.is_active === true && row.verified === true
+        && (typeof row.group === 'number' ? row.group : row.group?.id) === group;
+}
+
+export function DomainRegisterExisting({ close, back, setBusyGate }: { close: () => void; back: () => void; setBusyGate: (busy: boolean) => void }) {
+    const queryClient = useQueryClient();
+    const [group, setGroup] = useState<DnsGroupChoice | null>(null);
+    const [credential, setCredential] = useState<DnsCredentialRow | null>(null);
+    const [name, setName] = useState('');
+    const [busy, setBusy] = useState(false);
+    const [attempted, setAttempted] = useState(false);
+    const [error, setError] = useState('');
+    const inFlight = useRef(false);
+    // Both picker remounting and this ref reject responses/events from old scope.
+    const scope = useRef<number | null>(null);
+    const changeGroup = (selected: DnsGroupChoice | null) => {
+        if (inFlight.current || attempted) return;
+        scope.current = selected?.id ?? null; setGroup(selected); setCredential(null); setError('');
+    };
+    const submit = async (event: React.FormEvent) => {
+        event.preventDefault();
+        if (inFlight.current || attempted) return;
+        if (!group || !usableRegistrationCredential(credential, group.id) || scope.current !== group.id) { setError('Choose an active, verified GoDaddy credential in the selected group'); return; }
+        let domain: string;
+        try { domain = normalizePurchaseDomain(name); } catch (reason) { setError(redactRegistrarError(reason)); return; }
+        inFlight.current = true; setBusy(true); setBusyGate(true); setError('');
+        // An unknown outcome is terminal for this mounted form: inspect inventory.
+        setAttempted(true);
+        try {
+            const saved = await registerExistingDomain({ group: group.id, domain, credential: credential.id });
+            await DomainModel.invalidate(queryClient); toast.success(`${saved.name} registered`); close();
+        } catch (reason) {
+            await DomainModel.invalidate(queryClient);
+            setError(`${redactRegistrarError(reason)} Refresh the domain inventory and review the provider account before starting another registration.`);
+        } finally { inFlight.current = false; setBusy(false); setBusyGate(false); }
+    };
+    const groupId = group?.id;
+    return <form className="modal-pad domain-onboarding" onSubmit={(event) => void submit(event)} noValidate>
+        <h2 className="modal-title">Register existing domain</h2>
+        <p className="dim">Connect a GoDaddy domain you already own. <OperationsHelp label="domain registration">The provider checks ownership of this exact name without charging or listing the provider account. Choose an authorized group and an active, verified GoDaddy credential belonging to it. If no credentials appear, link and verify one in Provider Credentials.</OperationsHelp></p>
+        {error && <div className="form-alert" role="alert">{error}</div>}
+        <div className="dns-registrar-grid">
+            <CollectionSelect<DnsGroupChoice> endpoint={DNS_GROUP_CHOICE_ENDPOINT} value={group} onChange={(_id, row) => changeGroup(row ?? null)} label="Authorized group" help="Choose the group that owns this domain." required maxItems={25} defaultParams={{ start: 0 }} disabled={busy || attempted} placeholder="Search eligible groups…" />
+            <label className="field"><span className="field-label">Domain name <em>*</em></span><input className="input" value={name} disabled={busy || attempted} onChange={(event) => setName(event.target.value)} placeholder="example.com" /></label>
+            {groupId ? <CollectionSelect<DnsCredentialRow> key={groupId} model={DnsCredentialModel} value={credential ? { ...credential } : null} label="GoDaddy credential" required maxItems={25} defaultParams={{ group: groupId, provider: 'godaddy', is_active: true, verified: true, start: 0 }} disabled={busy || attempted} placeholder="Search verified GoDaddy credentials…" help="An active, verified credential in the selected group." onChange={(_id, row) => {
+                if (scope.current !== groupId || inFlight.current || attempted) return;
+                if (!row) { setCredential(null); return; }
+                if (!usableRegistrationCredential(row, groupId)) { setCredential(null); setError('That credential is not usable in the selected group'); return; }
+                setCredential(row); setError('');
+            }} /> : <p className="dim">Choose an authorized group before selecting its GoDaddy credential.</p>}
+        </div>
+        <div className="modal-actions"><button className="btn" type="button" disabled={busy} onClick={attempted ? close : back}>{attempted ? 'Close and review inventory' : 'Back'}</button><button className="btn btn-primary" type="submit" disabled={busy || attempted || !group || !credential || !name.trim()}>{busy ? 'Checking ownership…' : 'Register existing'}</button></div>
+    </form>;
+}

package/src/admin/dns/DomainRegistrarSettings.tsx

@@ -0,0 +1,52 @@
+import { useRef, useState } from 'react';
+import { useQueryClient } from '@tanstack/react-query';
+import { hasPermission, useMe } from '../../client/runtime';
+import { fetchDomainOverview, saveDomainRegistrarSettings } from './registrar-api';
+import { DNS_MANAGE_PERMISSIONS, DomainModel, type DomainRow } from './models';
+import { modal } from '../../ui';
+import { redactRegistrarError } from './purchase-data';
+
+export function DomainRegistrarSettings({ domain, onBusyChange, close }: { domain: DomainRow; onBusyChange?: (busy: boolean) => void; close?: () => void }) {
+    const { data: me } = useMe(); const queryClient = useQueryClient();
+    const [autoRenew, setAutoRenew] = useState(domain.auto_renew === true);
+    const [privacy, setPrivacy] = useState(domain.privacy === true);
+    const [live, setLive] = useState(domain);
+    const [busy, setBusy] = useState(false); const [error, setError] = useState(''); const [saved, setSaved] = useState(false);
+    const [uncertain, setUncertain] = useState(false); const inFlight = useRef(false);
+    if (domain.provider !== 'route53' || !hasPermission(me ?? null, DNS_MANAGE_PERMISSIONS, null)) return null;
+    const changed = autoRenew !== (live.auto_renew === true) || privacy !== (live.privacy === true);
+    const submit = async (event: React.FormEvent) => {
+        event.preventDefault(); if (inFlight.current || uncertain || !changed) return;
+        const changes: Partial<Pick<DomainRow, 'auto_renew' | 'privacy'>> = {};
+        if (autoRenew !== (live.auto_renew === true)) changes.auto_renew = autoRenew;
+        if (privacy !== (live.privacy === true)) changes.privacy = privacy;
+        inFlight.current = true; onBusyChange?.(true); setBusy(true); setError(''); setSaved(false);
+        let failed = false;
+        try { await saveDomainRegistrarSettings(domain.id, changes); }
+        catch (reason) { failed = true; setUncertain(true); setError(`${redactRegistrarError(reason)} The registrar outcome is uncertain. Inspect the registrar before another change.`); }
+        finally {
+            try {
+                const fresh = await fetchDomainOverview(domain.id);
+                queryClient.setQueryData(DomainModel.keys.one(domain.id), fresh);
+                setLive(fresh); setAutoRenew(fresh.auto_renew === true); setPrivacy(fresh.privacy === true);
+                if (!failed) setSaved(true);
+            } catch { setUncertain(true); setError('The authoritative domain could not be refreshed. Inspect the registrar and reopen this domain before making another change.'); }
+            await DomainModel.invalidate(queryClient);
+            inFlight.current = false; onBusyChange?.(false); setBusy(false);
+        }
+    };
+    return <form className="modal-pad domains-registrar-settings" onSubmit={(event) => void submit(event)}>
+        <h2 className="modal-title">Registrar settings</h2><p className="dim">Route 53 only. A database save does not prove that the registrar applied the change.</p>
+        {error && <div className="form-alert" role="alert">{error}</div>}
+        {live.last_error && <div className="form-alert" role="status"><b>Registrar warning</b><p>{redactRegistrarError(live.last_error)}</p><p>This may be historical. Inspect the registrar before assuming the setting was applied.</p></div>}
+        {saved && <p role="status">Domain refreshed after save. Check the registrar for application of these settings.</p>}
+        <label className="field"><span><input type="checkbox" checked={autoRenew} disabled={busy || uncertain} onChange={(event) => setAutoRenew(event.target.checked)} /> Auto-renew</span></label>
+        <label className="field"><span><input type="checkbox" checked={privacy} disabled={busy || uncertain} onChange={(event) => setPrivacy(event.target.checked)} /> WHOIS privacy</span></label>
+        <div className="modal-actions">{close && <button className="btn" type="button" disabled={busy} onClick={close}>Close</button>}<button className="btn btn-primary" type="submit" disabled={busy || uncertain || !changed}>{busy ? 'Saving and refreshing…' : 'Save registrar settings'}</button></div>
+    </form>;
+}
+
+export function showDomainRegistrarSettings(domain: DomainRow): Promise<unknown> {
+    let busy = false;
+    return modal.open((close) => <DomainRegistrarSettings domain={domain} close={() => close(null)} onBusyChange={(value) => { busy = value; }} />, { size: 'md', canDismiss: () => !busy });
+}

package/src/admin/dns/DomainsPage.tsx

@@ -1,17 +1,12 @@
 import { useQueryClient } from '@tanstack/react-query';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { Badge, ModelTable, fmt, modal, type Column, type FilterDef } from '../../ui';
 import { DomainDetail } from './DomainDetail';
-import { DomainModel, type DomainRow } from './models';
+import { hasPermission, useMe } from '../../client/runtime';
+import { DomainModel, DNS_MANAGE_PERMISSIONS, type DomainRow } from './models';
 import { providerLabel } from './data';
+import { domainRecordsHref, domainScopeLabel, supportsDomainRecords } from './domain-navigation';
 
-const columns: Column<DomainRow>[] = [
-    { key: 'name', label: 'Domain', sortable: true, hideable: false, render: (row) => <code>{row.name}</code> },
-    { key: 'provider', label: 'Provider', sortable: true, render: (row) => providerLabel(row.provider) },
-    { key: 'status', label: 'Status', sortable: true, render: (row) => <Badge tone={fmt.inferTone(row.status)}>{row.status}</Badge> },
-    { key: 'group', label: 'Group', render: (row) => typeof row.group === 'object' ? row.group?.name ?? 'Platform' : row.group ?? 'Platform' },
-    { key: 'expires', label: 'Expires', sortable: true, render: (row) => fmt.date(row.expires) },
-    { key: 'created', label: 'Created', sortable: true, render: (row) => fmt.date(row.created) },
-];
 const filters: FilterDef[] = [
     { key: 'provider', label: 'Provider', type: 'select', options: [{ value: 'route53', label: 'Route 53' }, { value: 'godaddy', label: 'GoDaddy' }, { value: 'mojo', label: 'Mojo certificate-only' }] },
     { key: 'status', label: 'Status', type: 'select', options: ['pending', 'registering', 'active'].map((value) => ({ value, label: value })) },
@@ -19,9 +14,27 @@ const filters: FilterDef[] = [
 
 export function DomainsPage() {
     const queryClient = useQueryClient();
-    const open = async (row: DomainRow) => {
-        await DomainModel.fetchOne(queryClient, row.id);
-        await modal.detail((close) => <DomainDetail id={row.id} onClose={() => close(null)} />);
+    const { data: me } = useMe();
+    const location = useLocation(); const navigate = useNavigate();
+    const canManage = hasPermission(me ?? null, DNS_MANAGE_PERMISSIONS, null);
+    const start = async (initialMode: 'register' | 'adopt' | 'purchase') => {
+        const { showDomainOnboarding } = await import('./DomainOnboardingDialog');
+        await showDomainOnboarding({ initialMode });
+    };
+    const open = (row: DomainRow) => {
+        void DomainModel.fetchOne(queryClient, row.id).catch(() => undefined);
+        void modal.detail((close) => <DomainDetail id={row.id} onClose={() => close(null)} />);
     };
-    return <ModelTable<DomainRow> model={DomainModel} eyebrow="Infrastructure · DNS" title="Domains" searchable searchPlaceholder="Search domain names" columns={columns} filters={filters} defaultParams={{ sort: 'name' }} columnChooser persistState persistKey="admin:dns:domains" onRowClick={(row) => void open(row)} />;
+    const columns: Column<DomainRow>[] = [
+        { key: 'name', label: 'Domain', sortable: true, hideable: false, render: (row) => <span className="ops-cell"><strong>{row.name}</strong><small>{providerLabel(row.provider)}</small></span> },
+        { key: 'status', label: 'Status', sortable: true, render: (row) => <Badge tone={fmt.inferTone(row.status)}>{row.status}</Badge> },
+        { key: 'expires', label: 'Expires', sortable: true, render: (row) => fmt.date(row.expires) },
+        { key: 'group', label: 'Scope', render: (row) => <span className="domains-scope">{domainScopeLabel(row.group)}</span> },
+        { key: 'records', label: 'DNS Records', render: (row) => supportsDomainRecords(row.provider) ? <button className="btn btn-sm" type="button" onClick={(event) => { event.stopPropagation(); navigate(domainRecordsHref(location.pathname, row.id)); }}>DNS Records <i className="bi bi-arrow-right" /></button> : <span className="dim">{row.provider === 'mojo' ? 'Certificate-only' : 'Provider unavailable'}</span> },
+    ];
+    return <div className="domains-page">
+        <header className="domains-header"><div><div className="eyebrow">Network &amp; hosting</div><h1>Domains</h1><p className="dim">Manage the names this installation controls.</p></div>{canManage && <div className="domains-actions"><button className="btn" onClick={() => void start('register')}>Register existing</button>{me?.is_superuser === true && <button className="btn" onClick={() => void start('adopt')}>Adopt</button>}<button className="btn btn-primary" onClick={() => void start('purchase')}>Buy domain</button></div>}</header>
+        <ModelTable<DomainRow> model={DomainModel} title="Managed domains" searchable searchPlaceholder="Search domain names" columns={columns} filters={filters} defaultParams={{ sort: 'name' }} columnChooser persistState persistKey="admin:dns:domains" onRowClick={open} />
+        {canManage && <details className="domains-advanced"><summary>Advanced</summary><p className="dim">Connect external domains to shared wildcard validation, or review controller allocations and trust.</p><button className="btn" onClick={() => void import('./SharedValidationDialog').then(({ openSharedValidation }) => openSharedValidation())}>Shared validation setup</button></details>}
+    </div>;
 }