Agentic UI: Site Creation

apps/local/src/index.ts

@@ -24,6 +24,7 @@ import { DEFAULT_TOKEN_LIFETIME_MS } from '@studio/common/constants';
 import { createCliRunner } from '@studio/common/lib/cli-process';
 import {
 	addConnectedWpcomSite,
+	getAllConnectedWpcomSitesForCurrentUser,
 	getConnectedWpcomSitesForLocalSite,
 	removeConnectedWpcomSite,
 } from '@studio/common/lib/connected-sites';
@@ -35,7 +36,7 @@ import {
 } from '@studio/common/lib/fs-utils';
 import { generateNumberedName, generateSiteName } from '@studio/common/lib/generate-site-name';
 import { isErrnoException } from '@studio/common/lib/is-errno-exception';
-import { getAuthenticationUrl } from '@studio/common/lib/oauth';
+import { getAuthenticationUrl, getSignUpUrl } from '@studio/common/lib/oauth';
 import { decodePassword } from '@studio/common/lib/passwords';
 import { sanitizeFolderName } from '@studio/common/lib/sanitize-folder-name';
 import {
@@ -363,7 +364,13 @@ export async function startLocalServer( options: LocalServerOptions ): Promise<
 			res.json( { url: null } );
 			return;
 		}
-		res.json( { url: getAuthenticationUrl( 'en', redirectUri ) } );
+		// `signup=1` routes through WordPress.com account creation first, then
+		// back into the same authorize redirect.
+		const url =
+			req.query.signup === '1'
+				? getSignUpUrl( 'en', redirectUri )
+				: getAuthenticationUrl( 'en', redirectUri );
+		res.json( { url } );
 	} );
 
 	// Log in by storing a token from the redirect callback (or pasted from
@@ -501,6 +508,22 @@ export async function startLocalServer( options: LocalServerOptions ): Promise<
 		} )
 	);
 
+	// Numbered-name collision search ("My Site", "My Site 2", ...) against both
+	// existing site names and non-empty site folders — mirrors the desktop's
+	// findAvailableSitePath.
+	api.get(
+		'/site-defaults/available-path',
+		asyncHandler( async ( req: Request, res: Response ) => {
+			const sites = await listSites( execute );
+			const name = await generateNumberedName(
+				String( req.query.name ?? '' ),
+				sites.map( ( s ) => s.name ),
+				sitesRoot
+			);
+			res.json( { name, path: path.join( sitesRoot, sanitizeFolderName( name ) ) } );
+		} )
+	);
+
 	api.post( '/paths/compare', ( req: Request, res: Response ) => {
 		const { path1, path2 } = req.body as { path1?: string; path2?: string };
 		res.json( { equal: !! path1 && !! path2 && arePathsEqual( path1, path2 ) } );
@@ -519,6 +542,7 @@ export async function startLocalServer( options: LocalServerOptions ): Promise<
 				adminUsername?: string;
 				adminPassword?: string;
 				adminEmail?: string;
+				skipStart?: boolean;
 				// Optional Blueprint to apply on creation: `blueprint` is the parsed
 				// blueprint JSON; `filePath` (set for uploaded ZIP bundles) lets the
 				// CLI resolve relative assets.
@@ -546,6 +570,7 @@ export async function startLocalServer( options: LocalServerOptions ): Promise<
 				adminUsername: body.adminUsername,
 				adminPassword: body.adminPassword,
 				adminEmail: body.adminEmail,
+				noStart: body.skipStart,
 				blueprint: body.blueprint?.blueprint,
 				originalBlueprintPath: body.blueprint?.filePath,
 			} );
@@ -559,6 +584,14 @@ export async function startLocalServer( options: LocalServerOptions ): Promise<
 				} );
 			} finally {
 				cleanup();
+				// The client intentionally skips success-path cleanup of an uploaded
+				// ZIP bundle's extract dir (see blueprint-selector) — the desktop
+				// removes it once create settles, so mirror that here.
+				if ( body.blueprint?.filePath ) {
+					await cleanupBlueprintTempDir(
+						path.dirname( path.resolve( body.blueprint.filePath ) )
+					).catch( () => undefined );
+				}
 			}
 
 			const created = ( await listSites( execute ) ).find( ( s ) => s.id === siteId );
@@ -966,6 +999,15 @@ export async function startLocalServer( options: LocalServerOptions ): Promise<
 		} )
 	);
 
+	// All connections for the current user, across local sites — the browser
+	// analog of the desktop's empty-id getConnectedWpcomSites contract.
+	api.get(
+		'/wpcom/connected-sites',
+		asyncHandler( async ( _req: Request, res: Response ) => {
+			res.json( await getAllConnectedWpcomSitesForCurrentUser() );
+		} )
+	);
+
 	api.get(
 		'/sites/:id/connected-sites',
 		asyncHandler( async ( req: Request, res: Response ) => {

apps/studio/src/ipc-handlers.ts

@@ -50,7 +50,10 @@ import {
 } from '@studio/common/lib/blueprint-bundle';
 import { validateBlueprintData } from '@studio/common/lib/blueprint-validation';
 import { parseCliError, errorMessageContains } from '@studio/common/lib/cli-error';
-import { getConnectedWpcomSitesForLocalSite } from '@studio/common/lib/connected-sites';
+import {
+	getConnectedWpcomSitesForLocalSite,
+	removeConnectedWpcomSite,
+} from '@studio/common/lib/connected-sites';
 import { createDeployIgnoreFilter } from '@studio/common/lib/deploy-ignore';
 import {
 	calculateDirectorySizeForArchive,
@@ -1116,6 +1119,18 @@ export async function deleteSite( event: IpcMainInvokeEvent, id: string, deleteF
 		throw new Error( 'Site not found.' );
 	}
 	await server.delete( deleteFiles );
+	// Remove the deleted site's WordPress.com connections so the remote sites
+	// don't stay marked as connected to a local site that no longer exists.
+	// Owning this here covers every caller (default UI, apps/ui, rollbacks).
+	try {
+		const connectedSites = await getConnectedWpcomSitesForLocalSite( id );
+		for ( const site of connectedSites ) {
+			await removeConnectedWpcomSite( id, site.id );
+		}
+	} catch ( error ) {
+		// Cleanup must not fail the deletion itself.
+		Sentry.captureException( error );
+	}
 }
 
 export async function copySite(

apps/studio/src/lib/oauth.ts

@@ -1,12 +1,6 @@
-import { CLIENT_ID } from '@studio/common/constants';
-import { SupportedLocale } from '@studio/common/lib/locale';
-import { getAuthenticationUrl } from '@studio/common/lib/oauth';
 import { readAuthToken, type StoredAuthToken } from '@studio/common/lib/shared-config';
 
-export function getSignUpUrl( locale: SupportedLocale ) {
-	const oauth2Redirect = encodeURIComponent( getAuthenticationUrl( locale ) );
-	return `https://wordpress.com/start/wpcc/oauth2-user?oauth2_client_id=${ CLIENT_ID }&oauth2_redirect=${ oauth2Redirect }&locale=${ locale }`;
-}
+export { getSignUpUrl } from '@studio/common/lib/oauth';
 
 export async function getAuthenticationToken(): Promise< StoredAuthToken | null > {
 	return readAuthToken();

apps/studio/src/modules/add-site/components/new-site-options.tsx

@@ -1,3 +1,7 @@
+import {
+	curateBlueprintsForDisplay,
+	FEATURED_BLUEPRINT_SLUGS,
+} from '@studio/common/lib/blueprint-curation';
 import {
 	__experimentalVStack as VStack,
 	__experimentalHeading as Heading,
@@ -171,46 +175,6 @@ function BlueprintCard( {
 	);
 }
 
-const BLUEPRINT_DISPLAY_NAMES: Record< string, string > = {
-	'Quick Start': 'WordPress.com',
-	Development: 'WordPress Dev',
-	Commerce: 'WooCommerce',
-};
-
-function getBlueprintExcerptOverrides( __: ( text: string ) => string ): Record< string, string > {
-	return {
-		'Quick Start': __(
-			'A WordPress.com-like environment with Business plan plugins and themes pre-installed.'
-		),
-		Commerce: __(
-			'Create your next online store with WooCommerce and its companion plugins pre-installed.'
-		),
-		Development: __( 'A streamlined environment for building and testing themes or plugins.' ),
-	};
-}
-
-const BLUEPRINT_ORDER: Record< string, number > = {
-	'Quick Start': 1,
-	Commerce: 2,
-	Development: 3,
-};
-
-const FEATURED_BLUEPRINT_SLUGS = new Set( [ 'woo-shop', 'development', 'quick-start' ] );
-
-function renameBlueprintsForDisplay(
-	blueprints: Blueprint[],
-	__: ( text: string ) => string
-): Blueprint[] {
-	const excerptOverrides = getBlueprintExcerptOverrides( __ );
-	return [ ...blueprints ]
-		.sort( ( a, b ) => ( BLUEPRINT_ORDER[ a.title ] ?? 99 ) - ( BLUEPRINT_ORDER[ b.title ] ?? 99 ) )
-		.map( ( item ) => ( {
-			...item,
-			excerpt: excerptOverrides[ item.title ] || item.excerpt,
-			title: BLUEPRINT_DISPLAY_NAMES[ item.title ] || item.title,
-		} ) );
-}
-
 export function NewSiteOptions( {
 	blueprints,
 	isLoadingBlueprints,
@@ -286,7 +250,7 @@ export function NewSiteOptions( {
 						{ __( 'Could not load templates.' ) }
 					</div>
 				) : (
-					renameBlueprintsForDisplay( featuredBlueprints, __ ).map( ( item ) => (
+					curateBlueprintsForDisplay( featuredBlueprints, __ ).map( ( item ) => (
 						<BlueprintCard
 							key={ item.slug }
 							blueprint={ item }

apps/studio/src/modules/sync/components/sync-sites-modal-selector.tsx

@@ -1,3 +1,4 @@
+import { getMshotUrl } from '@studio/common/lib/sync/mshots';
 import { Icon, SearchControl as SearchControlWp, Spinner } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 import { useI18n } from '@wordpress/react-i18n';
@@ -418,10 +419,6 @@ function ListSites( {
 	);
 }
 
-function getMshotUrl( siteUrl: string ): string {
-	return `https://s0.wp.com/mshots/v1/${ encodeURIComponent( siteUrl ) }?w=600&h=400`;
-}
-
 function SiteThumbnail( {
 	site,
 	isDisabled,

apps/studio/src/modules/sync/lib/environment-utils.ts

@@ -1,23 +1,5 @@
-import { SyncSite } from '@studio/common/types/sync';
-import { __ } from '@wordpress/i18n';
-import { z } from 'zod';
-
-const EnvironmentSchema = z.enum( [ 'production', 'staging', 'development' ] );
-export type EnvironmentType = z.infer< typeof EnvironmentSchema >;
-
-export const getSiteEnvironment = ( site: SyncSite ): EnvironmentType => {
-	if ( site.isPressable ) {
-		const parsed = EnvironmentSchema.safeParse( site.environmentType );
-		return parsed.success ? parsed.data : 'production';
-	}
-	return site.isStaging ? 'staging' : 'production';
-};
-
-export const getEnvironmentLabel = ( type: EnvironmentType ): string => {
-	const labels: Record< EnvironmentType, string > = {
-		production: __( 'Production' ),
-		staging: __( 'Staging' ),
-		development: __( 'Development' ),
-	};
-	return labels[ type ] || type.charAt( 0 ).toUpperCase() + type.slice( 1 );
-};
+export {
+	getEnvironmentLabel,
+	getSiteEnvironment,
+	type EnvironmentType,
+} from '@studio/common/lib/sync/environment-utils';

apps/ui/package.json

@@ -23,6 +23,7 @@
 		"@tanstack/react-query": "^5.75.5",
 		"@tanstack/react-query-persist-client": "^5.96.2",
 		"@tanstack/react-router": "^1.120.14",
+		"@wordpress/a11y": "^4.47.0",
 		"@wordpress/api-fetch": "^7.47.0",
 		"@wordpress/components": "^34.0.0",
 		"@wordpress/core-data": "^7.47.0",