Agentic UI: Strip local domain suffix from publish flow domain suggestion

apps/studio/src/lib/generate-checkout-url.ts

@@ -1,4 +1,4 @@
-import { DEFAULT_CUSTOM_DOMAIN_SUFFIX } from '@studio/common/constants';
+import { stripLocalDomainSuffix } from '@studio/common/lib/domains';
 
 export function generateCheckoutUrl(
 	selectedSite?: SiteDetails,
@@ -15,7 +15,7 @@ export function generateCheckoutUrl(
 	}
 
 	const suggestedName = selectedSite.customDomain
-		? selectedSite.customDomain.replace( DEFAULT_CUSTOM_DOMAIN_SUFFIX, '' )
+		? stripLocalDomainSuffix( selectedSite.customDomain )
 		: selectedSite.name;
 
 	url.searchParams.set( 'studioSiteId', String( selectedSite.id ) );

apps/ui/src/data/core/connectors/publish-checkout-url.ts

@@ -1,3 +1,4 @@
+import { stripLocalDomainSuffix } from '@studio/common/lib/domains';
 import type { SiteDetails } from '../types';
 
 export function buildPublishCheckoutUrl( site: SiteDetails ): string {
@@ -6,7 +7,10 @@ export function buildPublishCheckoutUrl( site: SiteDetails ): string {
 	url.searchParams.set( 'section', 'publish-site' );
 	url.searchParams.set( 'showDomainStep', 'true' );
 	url.searchParams.set( 'studioSiteId', site.id );
-	url.searchParams.set( 'new', site.customDomain ?? site.name );
+	url.searchParams.set(
+		'new',
+		site.customDomain ? stripLocalDomainSuffix( site.customDomain ) : site.name
+	);
 	url.searchParams.set( 'autoOpenPush', 'true' );
 	return url.toString();
 }

packages/common/lib/domains.ts

@@ -14,6 +14,16 @@ export const generateCustomDomainFromSiteName = ( siteName: string ): string =>
 	return `${ domainBase }${ DEFAULT_CUSTOM_DOMAIN_SUFFIX }`;
 };
 
+export const stripLocalDomainSuffix = ( domain: string ): string => {
+	if ( domain.endsWith( DEFAULT_CUSTOM_DOMAIN_SUFFIX ) ) {
+		return domain.slice( 0, -DEFAULT_CUSTOM_DOMAIN_SUFFIX.length );
+	}
+	if ( domain.endsWith( '.local' ) ) {
+		return domain.slice( 0, -'.local'.length );
+	}
+	return domain;
+};
+
 export const getDomainNameValidationError = (
 	useCustomDomain: boolean,
 	domainName: string | null,

packages/common/lib/tests/domains.test.ts

@@ -0,0 +1,26 @@
+/**
+ * @vitest-environment node
+ */
+import { stripLocalDomainSuffix } from '@studio/common/lib/domains';
+
+describe( 'stripLocalDomainSuffix', () => {
+	it( 'strips the default .wp.local suffix entirely', () => {
+		expect( stripLocalDomainSuffix( 'mysite.wp.local' ) ).toBe( 'mysite' );
+	} );
+
+	it( 'strips a single trailing .local label', () => {
+		expect( stripLocalDomainSuffix( 'mysite.local' ) ).toBe( 'mysite' );
+	} );
+
+	it( 'keeps inner labels when stripping .local', () => {
+		expect( stripLocalDomainSuffix( 'mysite.com.local' ) ).toBe( 'mysite.com' );
+	} );
+
+	it( 'only strips the suffix, not inner occurrences', () => {
+		expect( stripLocalDomainSuffix( 'wp.local.mysite.local' ) ).toBe( 'wp.local.mysite' );
+	} );
+
+	it( 'leaves non-local domains unchanged', () => {
+		expect( stripLocalDomainSuffix( 'mysite.com' ) ).toBe( 'mysite.com' );
+	} );
+} );