ensure suggested app names are valid

packages/app/src/cli/commands/app/init.ts

@@ -7,6 +7,7 @@ import {validateFlavorValue, validateTemplateValue} from '../../services/init/va
 import {MinimalOrganizationApp, Organization, OrganizationApp} from '../../models/organization.js'
 import {appNamePrompt, createAsNewAppPrompt, selectAppPrompt} from '../../prompts/dev.js'
 import {searchForAppsByNameFactory} from '../../services/dev/prompt-helpers.js'
+import {isValidName} from '../../models/app/validation/common.js'
 import {Flags} from '@oclif/core'
 import {globalFlags} from '@shopify/cli-kit/node/cli'
 import {resolvePath, cwd} from '@shopify/cli-kit/node/path'
@@ -72,7 +73,7 @@ export default class Init extends AppCommand {
     validateFlavorValue(flags.template, flags.flavor)
 
     const inferredPackageManager = inferPackageManager(flags['package-manager'])
-    const name = flags.name ?? (await generateRandomNameForSubdirectory({suffix: 'app', directory: flags.path}))
+    const name = flags.name ?? (await getAppName(flags.path))
 
     // Force user authentication before prompting.
     let developerPlatformClient = selectDeveloperPlatformClient()
@@ -126,6 +127,15 @@ export default class Init extends AppCommand {
   }
 }
 
+async function getAppName(directory: string): Promise<string> {
+  for (let i = 0; i < 3; i++) {
+    // eslint-disable-next-line no-await-in-loop
+    const name = await generateRandomNameForSubdirectory({suffix: 'app', directory})
+    if (isValidName(name)) return name
+  }
+  return ''
+}
+
 export type SelectAppOrNewAppNameResult =
   | {
       result: 'new'

packages/app/src/cli/models/app/validation/common.ts

@@ -20,3 +20,9 @@ function isValidUrl(input: string, httpsOnly: boolean) {
 export function ensurePathStartsWithSlash(arg: unknown) {
   return typeof arg === 'string' && !arg.startsWith('/') ? `/${arg}` : arg
 }
+
+export const APP_NAME_MAX_LENGTH = 30
+
+export function isValidName(name: string): boolean {
+  return name.length <= APP_NAME_MAX_LENGTH
+}

packages/app/src/cli/prompts/dev.ts

@@ -3,6 +3,7 @@ import {Organization, MinimalOrganizationApp, OrganizationStore, MinimalAppIdent
 import {getTomls} from '../utilities/app/config/getTomls.js'
 import {setCachedCommandTomlMap} from '../services/local-storage.js'
 import {Paginateable} from '../utilities/developer-platform-client.js'
+import {APP_NAME_MAX_LENGTH} from '../models/app/validation/common.js'
 import {
   RenderAutocompleteOptions,
   renderAutocompletePrompt,
@@ -129,8 +130,8 @@ export async function appNamePrompt(currentName: string): Promise<string> {
       if (value.length === 0) {
         return "App name can't be empty"
       }
-      if (value.length > 30) {
-        return 'Enter a shorter name (30 character max.)'
+      if (value.length > APP_NAME_MAX_LENGTH) {
+        return `Enter a shorter name (${APP_NAME_MAX_LENGTH} character max.)`
       }
       if (value.includes('shopify')) {
         return 'Name can\'t contain "shopify." Enter another name.'

packages/cli-kit/src/public/common/string.ts

@@ -110,7 +110,6 @@ const SAFE_RANDOM_BUSINESS_NOUNS = [
   'franchise',
   'subsidiary',
   'logistics',
-  'infrastructure',
   'sponsorship',
   'partnership',
   'tax',