From b830cad2ae36832ad4dfbefb19e847a42eb195d5 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 17 Aug 2026 20:16:51 +0200
Subject: [PATCH 01/10] feat(onboarding): split app creation into tracked steps

---
 messages/en.context.json                      |  24 +-
 messages/en.json                              |  24 +-
 src/components.d.ts                           |   3 +-
 .../dashboard/AppOnboardingFlow.vue           | 576 ++++++++++++++----
 .../dashboard/AppOnboardingIconInput.vue      |  10 +-
 src/utils/onboardingProgressAnalytics.ts      |  32 +-
 src/utils/userOnboardingProgress.ts           |  20 +-
 .../utils/frontend_onboarding_analytics.ts    |  14 +-
 ...app-onboarding-apikey-loading.unit.test.ts |   2 +-
 ...boarding-progress-integration.unit.test.ts |  13 +-
 tests/app-onboarding-v3.unit.test.ts          | 124 +++-
 ...frontend-onboarding-analytics.unit.test.ts |  10 +-
 ...rding-details-field-debouncer.unit.test.ts |   7 +-
 ...onboarding-progress-analytics.unit.test.ts |  58 ++
 tests/user-onboarding-progress.unit.test.ts   |   4 +
 15 files changed, 774 insertions(+), 147 deletions(-)

diff --git a/messages/en.context.json b/messages/en.context.json
index fded3caf6a..05e36e31c1 100644
--- a/messages/en.context.json
+++ b/messages/en.context.json
@@ -1654,7 +1654,6 @@
   "key-upload": "Used in Capgo web console. Role: short UI label about \"key upload\". Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "key-write": "Used in Capgo web console. Role: short UI label about \"key write\". Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "language": "Used in Capgo web console areas: pages/settings/account. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
-  "learn-more": "Used in pre-organization app onboarding. Role: button opening additional App ID guidance.",
   "last": "Used in Capgo web console. Role: short UI label about \"last\". Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "last-1-hour": "Used in Capgo web console areas: services. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "last-12-hours": "Used in Capgo web console areas: services. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
@@ -3038,5 +3037,26 @@
   "your-api-key": "Used in Capgo web console areas: services. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "your-role-in-org": "Used in Capgo web console areas: pages. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "your-usage": "Used in Capgo web console areas: pages/settings/organization. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
-  "zip-bundle": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged."
+  "zip-bundle": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "app-onboarding-icon-step-helper": "Used in app onboarding details wizard. Role: helper text.",
+  "app-onboarding-icon-step-title": "Used in app onboarding details wizard. Role: step title.",
+  "app-onboarding-import-icon-only-button": "Used in app onboarding details wizard. Role: button label.",
+  "app-onboarding-import-icon-only-helper": "Used in app onboarding details wizard. Role: helper text explaining that store re-import changes only the icon.",
+  "app-onboarding-import-icon-only-title": "Used in app onboarding details wizard. Role: section title.",
+  "app-onboarding-imported-icon-alt": "Used in app onboarding details wizard. Role: image alternative text.",
+  "app-onboarding-imported-icon-helper": "Used in app onboarding details wizard. Role: helper text.",
+  "app-onboarding-imported-icon-label": "Used in app onboarding details wizard. Role: status label.",
+  "app-onboarding-imported-icon-selected": "Used in app onboarding details wizard. Role: selected button label.",
+  "app-onboarding-name-step-helper": "Used in app onboarding details wizard. Role: helper text.",
+  "app-onboarding-name-step-title": "Used in app onboarding details wizard. Role: step title.",
+  "app-onboarding-remove-icon": "Used in app onboarding details wizard. Role: button label.",
+  "app-onboarding-skip-app-id": "Used in app onboarding details wizard. Role: button label that accepts Capgo's generated App ID.",
+  "app-onboarding-toast-store-icon-error": "Used in app onboarding details wizard. Role: error toast.",
+  "app-onboarding-use-different-icon": "Used in app onboarding details wizard. Role: section label.",
+  "app-onboarding-use-imported-icon": "Used in app onboarding details wizard. Role: button label.",
+  "app-onboarding-app-id-generated-helper": "Used in app onboarding details wizard. Role: helper text. Preserve the {appId} placeholder.",
+  "app-onboarding-app-id-learn-more": "Used in app onboarding details wizard. Role: button opening guidance about Capgo App IDs.",
+  "app-onboarding-app-id-step-helper": "Used in app onboarding details wizard. Role: helper text.",
+  "app-onboarding-app-id-step-title": "Used in app onboarding details wizard. Role: step title.",
+  "app-onboarding-finish-details": "Used in app onboarding details wizard. Role: final creation button label."
 }
diff --git a/messages/en.json b/messages/en.json
index 580c924238..f40e530a7e 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -449,10 +449,19 @@
   "app-onboarding-exploring-subtitle": "Setup isn't finished yet. You can keep exploring or continue onboarding.",
   "app-onboarding-exploring-title": "Exploring the Capgo dashboard",
   "app-onboarding-icon-choose-file": "Choose file",
-  "app-onboarding-icon-help": "The icon is optional. If you import from a store listing, Capgo will try to reuse the store icon automatically.",
+  "app-onboarding-icon-help": "Upload a square PNG, JPEG, or WebP image. The icon is optional.",
   "app-onboarding-icon-label": "App icon",
   "app-onboarding-icon-no-file-selected": "No file selected",
   "app-onboarding-icon-preview-alt": "App icon preview",
+  "app-onboarding-icon-step-helper": "Keep the imported icon, upload something else, or continue without one.",
+  "app-onboarding-icon-step-title": "Choose an icon",
+  "app-onboarding-import-icon-only-button": "Import icon",
+  "app-onboarding-import-icon-only-helper": "Only the icon will change. Your app name and App ID stay exactly as they are.",
+  "app-onboarding-import-icon-only-title": "Import an icon from another store listing",
+  "app-onboarding-imported-icon-alt": "Imported store icon",
+  "app-onboarding-imported-icon-helper": "We found this icon in the store listing you imported.",
+  "app-onboarding-imported-icon-label": "Imported from store",
+  "app-onboarding-imported-icon-selected": "Using this icon",
   "app-onboarding-install-badge": "CLI onboarding",
   "app-onboarding-explore-dashboard": "Explore Capgo dashboard",
   "app-onboarding-explore-dashboard-confirm-description": "You can explore the dashboard now. Your app setup will remain available when you return.",
@@ -482,6 +491,8 @@
   "app-onboarding-mode-import-helper": "Use an App Store or Google Play link to prefill details.",
   "app-onboarding-mode-manual": "Set up manually",
   "app-onboarding-mode-manual-helper": "Type the app name and bundle or package ID yourself.",
+  "app-onboarding-name-step-helper": "Use the name people will recognize in Capgo. You can change it later.",
+  "app-onboarding-name-step-title": "What is your app called?",
   "app-onboarding-name-placeholder": "Capgo demo app",
   "app-onboarding-next-cleanup": "When the CLI marks onboarding as completed, the temporary onboarding data can be cleared automatically before the first real upload continues.",
   "app-onboarding-next-existing": "The CLI should attach Capgo to your existing project without scaffolding a new Capacitor app.",
@@ -493,6 +504,7 @@
   "app-onboarding-preview-bullet-two": "Demo data stays disposable. When the CLI completes, pending onboarding data can be cleared automatically.",
   "app-onboarding-preview-label": "Preview",
   "app-onboarding-preview-placeholder": "Your app",
+  "app-onboarding-remove-icon": "Remove icon",
   "app-onboarding-progress-label": "Onboarding progress",
   "app-onboarding-progress-count": "Step {current} of {total}",
   "app-onboarding-start-question": "How do you want to start?",
@@ -505,6 +517,7 @@
   "app-onboarding-store-link-label": "App Store or Google Play link",
   "app-onboarding-store-link-placeholder": "https://apps.apple.com/... or https://play.google.com/store/apps/details?id=com.example.app",
   "app-onboarding-store-screenshot-alt": "Store screenshot preview",
+  "app-onboarding-skip-app-id": "Skip",
   "app-onboarding-subtitle": "The app is created immediately in Capgo. From there you can either connect your real project in the CLI or explore the dashboard with temporary demo data.",
   "app-onboarding-summary-method": "Setup method",
   "app-onboarding-summary-source": "Starting point",
@@ -522,6 +535,14 @@
   "app-onboarding-toast-no-organization": "No organization selected.",
   "app-onboarding-toast-resume-not-found": "Unable to find the onboarding app.",
   "app-onboarding-toast-store-metadata-error": "Unable to fetch metadata from that store link.",
+  "app-onboarding-toast-store-icon-error": "Unable to find an app icon at this store link.",
+  "app-onboarding-use-different-icon": "Use something else",
+  "app-onboarding-use-imported-icon": "Use this icon",
+  "app-onboarding-app-id-generated-helper": "Leave this empty and Capgo will use {appId}.",
+  "app-onboarding-app-id-learn-more": "Learn more about Capgo App ID",
+  "app-onboarding-app-id-step-helper": "Use your bundle or package ID, import it from a store listing, or skip this step.",
+  "app-onboarding-app-id-step-title": "Set your App ID",
+  "app-onboarding-finish-details": "Create app",
   "app-onboarding-v2-ai-help-status": "Existing mobile project; store publication is optional",
   "app-onboarding-v2-appid-dialog-description": "Capgo uses this App ID to identify the app in the dashboard and CLI. It is often the same as your native project ID, but it does not have to be. Changing it here does not change your iOS Bundle Identifier, Android Application ID, Capacitor appId, or store listing.",
   "app-onboarding-v2-appid-dialog-title": "How does the Capgo App ID work?",
@@ -1517,7 +1538,6 @@
   "key-upload": "Upload",
   "key-write": "Write",
   "language": "Language",
-  "learn-more": "Learn more",
   "last": "Last",
   "last-12-months": "Last 12 Months",
   "last-30-minutes": "Last 30 minutes",
diff --git a/src/components.d.ts b/src/components.d.ts
index f127490e68..2b73180770 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,7 +28,6 @@ declare module 'vue' {
     AppOnboardingCliSteps: typeof import('./components/dashboard/AppOnboardingCliSteps.vue')['default']
     AppOnboardingFlow: typeof import('./components/dashboard/AppOnboardingFlow.vue')['default']
     AppOnboardingIconInput: typeof import('./components/dashboard/AppOnboardingIconInput.vue')['default']
-    AppOnboardingNextStep: typeof import('./components/dashboard/AppOnboardingNextStep.vue')['default']
     AppPageFrame: typeof import('./components/dashboard/AppPageFrame.vue')['default']
     AppPageNotFound: typeof import('./components/dashboard/AppPageNotFound.vue')['default']
     AppSetting: typeof import('./components/dashboard/AppSetting.vue')['default']
@@ -93,6 +92,7 @@ declare module 'vue' {
     Navbar: typeof import('./components/Navbar.vue')['default']
     OnboardingExploreBanner: typeof import('./components/dashboard/OnboardingExploreBanner.vue')['default']
     OnboardingSupportUsernames: typeof import('./components/dashboard/OnboardingSupportUsernames.vue')['default']
+    OrganizationOnboardingInvite: typeof import('./components/dashboard/OrganizationOnboardingInvite.vue')['default']
     OrgEmailNotificationsPanel: typeof import('./components/dashboard/OrgEmailNotificationsPanel.vue')['default']
     OrgNotificationStatsPanel: typeof import('./components/dashboard/OrgNotificationStatsPanel.vue')['default']
     PageLoader: typeof import('./components/PageLoader.vue')['default']
@@ -121,6 +121,7 @@ declare module 'vue' {
     TableLog: typeof import('./components/TableLog.vue')['default']
     Tabs: typeof import('./components/Tabs.vue')['default']
     TabSidebar: typeof import('./components/TabSidebar.vue')['default']
+    TechnicalTeammateInviteCard: typeof import('./components/dashboard/TechnicalTeammateInviteCard.vue')['default']
     Toast: typeof import('./components/Toast.vue')['default']
     Toggle: typeof import('./components/Toggle.vue')['default']
     TrialBanner: typeof import('./components/dashboard/TrialBanner.vue')['default']
diff --git a/src/components/dashboard/AppOnboardingFlow.vue b/src/components/dashboard/AppOnboardingFlow.vue
index 0b289c84e2..70b8a2febd 100644
--- a/src/components/dashboard/AppOnboardingFlow.vue
+++ b/src/components/dashboard/AppOnboardingFlow.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Database, Json } from '~/types/supabase.types'
 import type {
+  OnboardingAnalyticsStep,
   OnboardingCopyEvent,
   OnboardingDetailsEvent,
   OnboardingDetailsEventProperties,
@@ -107,6 +108,14 @@ type AppRow = Omit<Database['public']['Tables']['apps']['Row'], 'onboarding'> &
 type StandardFlowStep = 'details' | 'choice' | 'install' | 'setup'
 type PreOrgFlowStep = 'intent' | 'details' | 'organization' | 'setup'
 type OnboardingFlowStep = StandardFlowStep | PreOrgFlowStep
+type AppDetailsStep = 'name' | 'app_id' | 'icon'
+type AppDetailsAnalyticsStep = 'app_name' | 'app_id' | 'app_icon'
+
+const APP_DETAILS_ANALYTICS_STEPS: Record<AppDetailsStep, AppDetailsAnalyticsStep> = {
+  name: 'app_name',
+  app_id: 'app_id',
+  icon: 'app_icon',
+}
 
 interface UserCountStop {
   value: number
@@ -126,6 +135,7 @@ const isLoading = ref(true)
 const isHydratingOnboarding = ref(true)
 const isSubmitting = ref(false)
 const isImportingStore = ref(false)
+const isImportingStoreIcon = ref(false)
 const isResumeIconLoading = ref(false)
 const isSeedingDemo = ref(false)
 const isCliCommandVisible = ref(false)
@@ -133,6 +143,7 @@ const apiKey = ref<string | null>(null)
 const createdApp = ref<AppRow | null>(null)
 const reportedSetupSource = ref<'manual' | 'cli' | 'mcp' | 'ai' | null>(null)
 const flowStep = ref<OnboardingFlowStep>('details')
+const appDetailsStep = ref<AppDetailsStep>('name')
 const showLanguageSelector = computed(() => (
   (props.preOrg && !createdApp.value)
   || (flowStep.value === 'setup' && Boolean(createdApp.value))
@@ -141,11 +152,14 @@ const showLanguageSelector = computed(() => (
 const selectedIconFile = ref<File | null>(null)
 const localIconPreview = ref('')
 const storeIconPreview = ref('')
+const storeAppNamePreview = ref('')
 const storeScreenshotPreview = ref('')
+const useImportedStoreIcon = ref(false)
 const existingApp = ref<boolean | null>(null)
 const existingAppSetup = ref<'import' | 'manual' | null>(null)
 const appName = ref('')
 const storeUrl = ref('')
+const iconStoreUrl = ref('')
 const importedStoreAppId = ref('')
 const manualAppId = ref('')
 const appIdSuggestions = ref<string[]>([])
@@ -155,6 +169,8 @@ const selectedIntent = ref<OnboardingIntent | null>(null)
 const orgNameInput = ref('')
 const hasEditedOrgName = ref(false)
 const estimatedUsersIndex = ref<number | null>(null)
+const isStoreImportOpen = ref(false)
+const isStoreIconImportOpen = ref(false)
 const isOrganizationImportOpen = ref(false)
 const isImportingOrganizationWebsite = ref(false)
 const organizationWebsiteInput = ref('')
@@ -254,18 +270,9 @@ const resumeStep = computed(() => {
   const value = route.query.step
   return value === 'choice' || value === 'install' || value === 'setup' ? value : null
 })
-const canUseStoreImportPreview = computed(() => existingAppSetup.value === 'import' && (props.preOrg || existingApp.value === true))
+const canUseStoreImportPreview = computed(() => useImportedStoreIcon.value && !!storeIconPreview.value)
 const iconPreview = computed(() => localIconPreview.value || (canUseStoreImportPreview.value ? storeIconPreview.value : '') || '')
-const hasImportedStoreMetadata = computed(() => canUseStoreImportPreview.value && !!(importedStoreAppId.value || storeIconPreview.value || storeScreenshotPreview.value))
-const canShowAppDetails = computed(() => {
-  if (props.preOrg)
-    return true
-  if (existingApp.value === false)
-    return true
-  if (existingApp.value === true)
-    return existingAppSetup.value !== null
-  return false
-})
+const hasImportedStoreMetadata = computed(() => existingAppSetup.value === 'import' && !!(importedStoreAppId.value || storeIconPreview.value || storeAppNamePreview.value))
 const suggestedAppId = computed(() => {
   if (createdApp.value)
     return createdApp.value.app_id
@@ -283,6 +290,22 @@ const suggestedAppId = computed(() => {
   return `com.${orgSlug}.${appSlug}`
 })
 const generatedAppId = computed(() => createdApp.value?.app_id || manualAppId.value.trim() || suggestedAppId.value)
+const hasProvidedAppId = computed(() => Boolean(manualAppId.value.trim() || importedStoreAppId.value.trim()))
+const appNameInitial = computed(() => Array.from(appName.value.trim())[0]?.toLocaleUpperCase() ?? '')
+const selectedAppIdSource = computed<NonNullable<OnboardingDetailsEventProperties['app_id_source']>>(() => {
+  if (manualAppId.value.trim())
+    return 'manual'
+  if (existingAppSetup.value === 'import' && importedStoreAppId.value.trim())
+    return 'store'
+  return 'generated'
+})
+const selectedAppIconSource = computed<NonNullable<OnboardingDetailsEventProperties['icon_source']>>(() => {
+  if (selectedIconFile.value)
+    return 'file'
+  if (canUseStoreImportPreview.value)
+    return 'store'
+  return 'none'
+})
 function createAiHelpPrompt() {
   const resolvedAppId = createdApp.value?.app_id || generatedAppId.value || '[APP_ID]'
   const resolvedAppName = createdApp.value?.name?.trim() || appName.value.trim() || resolvedAppId
@@ -352,7 +375,7 @@ const onboardingProgressPersistence = createOnboardingProgressPersistence({
 
 function trackDetailsEvent(name: OnboardingDetailsEvent, details: OnboardingDetailsEventProperties = {}) {
   if (props.preOrg)
-    progressTracker?.trackDetailsEvent(name, details)
+    progressTracker?.trackDetailsEvent(name, details, analyticsStepFor('details'))
 }
 
 function trackOrganizationEvent(
@@ -364,8 +387,18 @@ function trackOrganizationEvent(
 
 const detailsFieldTracker = createOnboardingDetailsFieldDebouncer(trackDetailsEvent)
 
+function analyticsStepFor(flow: OnboardingFlowStep, detailsStep = appDetailsStep.value): OnboardingAnalyticsStep {
+  if (flow === 'details')
+    return APP_DETAILS_ANALYTICS_STEPS[detailsStep]
+  return flow
+}
+
 function initializeProgressTracking(resumed: boolean) {
-  const trackedSteps = appOnboardingSteps.value.map(step => step.id)
+  const trackedSteps = appOnboardingSteps.value.flatMap<OnboardingAnalyticsStep>((step) => {
+    if (step.id === 'details')
+      return Object.values(APP_DETAILS_ANALYTICS_STEPS)
+    return [step.id]
+  })
   if (!props.preOrg && resumed && flowStep.value === 'setup')
     trackedSteps.push('setup')
 
@@ -377,7 +410,7 @@ function initializeProgressTracking(resumed: boolean) {
     onboardingAttemptId: onboardingTelemetry.attemptId,
     onboardingRunId: onboardingTelemetry.runId,
   })
-  progressTracker.viewStep(flowStep.value)
+  progressTracker.viewStep(analyticsStepFor(flowStep.value))
   if (pendingDashboardExplored)
     trackDashboardExplored()
 }
@@ -387,12 +420,14 @@ function completeAndViewStep(nextStep: OnboardingFlowStep, completionProperties:
   if (previousStep === nextStep)
     return
 
-  progressTracker?.completeStep(previousStep, {
+  const previousAnalyticsStep = analyticsStepFor(previousStep)
+  const nextAnalyticsStep = analyticsStepFor(nextStep)
+  progressTracker?.completeStep(previousAnalyticsStep, {
     ...completionProperties,
-    nextStep,
+    nextStep: nextAnalyticsStep,
   })
   flowStep.value = nextStep
-  progressTracker?.viewStep(nextStep, previousStep)
+  progressTracker?.viewStep(nextAnalyticsStep, previousAnalyticsStep)
   void persistOnboardingProgress()
 }
 
@@ -401,8 +436,10 @@ function viewPreviousStep(nextStep: OnboardingFlowStep) {
   if (previousStep === nextStep)
     return
 
+  const previousAnalyticsStep = analyticsStepFor(previousStep)
+  const nextAnalyticsStep = analyticsStepFor(nextStep)
   flowStep.value = nextStep
-  progressTracker?.viewStep(nextStep, previousStep)
+  progressTracker?.viewStep(nextAnalyticsStep, previousAnalyticsStep)
   void persistOnboardingProgress()
 }
 
@@ -414,8 +451,11 @@ function snapshotOnboardingProgress(status: UserOnboardingStatus = 'in_progress'
     step: clampResumableOnboardingStep(flowStep.value, flow),
     flow,
     intent: selectedIntent.value,
+    detailsStep: appDetailsStep.value,
     appName: appName.value,
-    appId: generatedAppId.value,
+    appId: flowStep.value === 'details' && appDetailsStep.value !== 'icon' && !manualAppId.value.trim() && !importedStoreAppId.value
+      ? ''
+      : generatedAppId.value,
     existingApp: existingApp.value,
     existingAppSetup: existingAppSetup.value,
     storeUrl: storeUrl.value,
@@ -528,19 +568,24 @@ async function writeOnboardingProgress(
 
 function resetOnboardingForm() {
   flowStep.value = props.preOrg ? 'intent' : 'details'
+  appDetailsStep.value = 'name'
   selectedIntent.value = null
-  existingApp.value = null
+  existingApp.value = true
+  existingAppSetup.value = 'manual'
   appName.value = ''
   manualAppId.value = ''
   hasEditedAppId.value = false
   orgNameInput.value = ''
   hasEditedOrgName.value = false
   estimatedUsersIndex.value = null
+  isStoreImportOpen.value = false
+  isStoreIconImportOpen.value = false
   createdApp.value = null
   selectedIconFile.value = null
   if (localIconPreview.value.startsWith('blob:'))
     URL.revokeObjectURL(localIconPreview.value)
   localIconPreview.value = ''
+  iconStoreUrl.value = ''
   resetStoreImportState()
 }
 
@@ -550,6 +595,8 @@ function applyOnboardingProgress(progress: ReturnType<typeof parseUserOnboarding
 
   const flow = props.preOrg ? 'pre_org' : 'existing_org'
   flowStep.value = clampResumableOnboardingStep(progress.step, flow)
+  if (progress.details_step)
+    appDetailsStep.value = progress.details_step
   if (progress.intent)
     selectedIntent.value = progress.intent
   if (progress.existing_app === true || progress.existing_app === false)
@@ -716,22 +763,13 @@ function resetStoreImportState() {
   storeImportRun += 1
   storeUrl.value = ''
   storeIconPreview.value = ''
+  storeAppNamePreview.value = ''
   storeScreenshotPreview.value = ''
+  useImportedStoreIcon.value = false
   importedStoreAppId.value = ''
   isImportingStore.value = false
 }
 
-function togglePreOrgStoreImport() {
-  if (existingAppSetup.value === 'import') {
-    trackDetailsEvent('onboarding_store_import_hidden')
-    existingAppSetup.value = 'manual'
-    return
-  }
-
-  trackDetailsEvent('onboarding_store_import_shown')
-  existingAppSetup.value = 'import'
-}
-
 let resumeIconLoadRun = 0
 async function loadResumeIconPreview(rawIconUrl: string | null | undefined, appId: string, run: number) {
   if (!rawIconUrl || getImmediateImageUrl(rawIconUrl)) {
@@ -833,9 +871,11 @@ async function loadResumeApp() {
 
 async function importStoreMetadata() {
   const requestedUrl = storeUrl.value.trim()
-  if (!requestedUrl || existingAppSetup.value !== 'import')
+  if (!requestedUrl)
     return
 
+  existingApp.value = true
+  existingAppSetup.value = 'import'
   trackDetailsEvent('onboarding_store_import_submitted')
   const requestedRun = ++storeImportRun
   isImportingStore.value = true
@@ -851,22 +891,29 @@ async function importStoreMetadata() {
     if (error)
       throw error
 
-    if (typeof data?.name === 'string' && data.name.trim() && !appName.value.trim())
-      appName.value = data.name.trim()
+    storeAppNamePreview.value = typeof data?.name === 'string' ? data.name.trim() : ''
+    if (storeAppNamePreview.value) {
+      if (!appName.value.trim())
+        appName.value = storeAppNamePreview.value
+    }
 
     const importedIcon = typeof data?.icon_data_url === 'string' && data.icon_data_url.trim()
       ? data.icon_data_url.trim()
       : typeof data?.icon_url === 'string' && data.icon_url.trim()
         ? data.icon_url.trim()
         : ''
-    if (importedIcon && !localIconPreview.value)
-      storeIconPreview.value = importedIcon
+    storeIconPreview.value = importedIcon
+    if (importedIcon) {
+      if (!localIconPreview.value)
+        useImportedStoreIcon.value = true
+    }
+    else {
+      useImportedStoreIcon.value = false
+    }
 
-    if (typeof data?.screenshot_url === 'string' && data.screenshot_url.trim())
-      storeScreenshotPreview.value = data.screenshot_url.trim()
+    storeScreenshotPreview.value = typeof data?.screenshot_url === 'string' ? data.screenshot_url.trim() : ''
 
-    if (typeof data?.app_id === 'string' && data.app_id.trim())
-      importedStoreAppId.value = data.app_id.trim()
+    importedStoreAppId.value = typeof data?.app_id === 'string' ? data.app_id.trim() : ''
 
     if (props.preOrg)
       existingApp.value = true
@@ -887,6 +934,65 @@ async function importStoreMetadata() {
   }
 }
 
+let storeIconImportRun = 0
+async function importStoreIcon() {
+  const requestedUrl = iconStoreUrl.value.trim()
+  if (!requestedUrl)
+    return
+
+  trackDetailsEvent('onboarding_store_icon_import_submitted')
+  const requestedRun = ++storeIconImportRun
+  isImportingStoreIcon.value = true
+  try {
+    const { data, error } = await invokeCapgoApi('app/store-metadata', {
+      method: 'POST',
+      body: { url: requestedUrl },
+    })
+
+    if (requestedRun !== storeIconImportRun || iconStoreUrl.value.trim() !== requestedUrl)
+      return
+    if (error)
+      throw error
+
+    const importedIcon = typeof data?.icon_data_url === 'string' && data.icon_data_url.trim()
+      ? data.icon_data_url.trim()
+      : typeof data?.icon_url === 'string' && data.icon_url.trim()
+        ? data.icon_url.trim()
+        : ''
+    if (!importedIcon)
+      throw new Error('Store metadata did not include an app icon')
+
+    storeIconPreview.value = importedIcon
+    storeAppNamePreview.value = typeof data?.name === 'string' && data.name.trim()
+      ? data.name.trim()
+      : appName.value.trim()
+    selectImportedIcon()
+    isStoreIconImportOpen.value = false
+    trackDetailsEvent('onboarding_store_icon_import_succeeded')
+  }
+  catch (error) {
+    if (requestedRun !== storeIconImportRun || iconStoreUrl.value.trim() !== requestedUrl)
+      return
+    console.error('Cannot import store icon', error)
+    trackDetailsEvent('onboarding_store_icon_import_failed')
+    toast.error(t('app-onboarding-toast-store-icon-error'))
+  }
+  finally {
+    if (requestedRun === storeIconImportRun)
+      isImportingStoreIcon.value = false
+  }
+}
+
+function toggleStoreImport() {
+  isStoreImportOpen.value = !isStoreImportOpen.value
+  trackDetailsEvent(isStoreImportOpen.value ? 'onboarding_store_import_shown' : 'onboarding_store_import_hidden')
+}
+
+function toggleStoreIconImport() {
+  isStoreIconImportOpen.value = !isStoreIconImportOpen.value
+  trackDetailsEvent(isStoreIconImportOpen.value ? 'onboarding_store_icon_import_shown' : 'onboarding_store_icon_import_hidden')
+}
+
 function toggleOrganizationWebsiteImport() {
   isOrganizationImportOpen.value = !isOrganizationImportOpen.value
   if (isOrganizationImportOpen.value)
@@ -984,11 +1090,35 @@ function onSelectIconFormKit(value: unknown) {
   if (localIconPreview.value.startsWith('blob:'))
     URL.revokeObjectURL(localIconPreview.value)
   localIconPreview.value = file ? URL.createObjectURL(file) : ''
+  if (file)
+    useImportedStoreIcon.value = false
   isResumeIconLoading.value = false
   if (file)
     trackDetailsEvent('onboarding_app_icon_picked', { icon_source: 'file' })
 }
 
+function clearLocalIconSelection() {
+  if (localIconPreview.value.startsWith('blob:'))
+    URL.revokeObjectURL(localIconPreview.value)
+  selectedIconFile.value = null
+  localIconPreview.value = ''
+}
+
+function selectImportedIcon() {
+  clearLocalIconSelection()
+  useImportedStoreIcon.value = !!storeIconPreview.value
+  if (useImportedStoreIcon.value)
+    trackDetailsEvent('onboarding_app_icon_import_selected', { icon_source: 'store' })
+}
+
+function removeSelectedIcon() {
+  const removedIconSource = selectedAppIconSource.value
+  clearLocalIconSelection()
+  useImportedStoreIcon.value = false
+  if (removedIconSource !== 'none')
+    trackDetailsEvent('onboarding_app_icon_removed', { icon_source: removedIconSource })
+}
+
 function onIconPickerOpened() {
   trackDetailsEvent('onboarding_app_icon_picker_opened')
 }
@@ -1009,6 +1139,7 @@ function onAppIdInput(event: Event) {
   hasEditedAppId.value = true
   manualAppId.value = (event.target as HTMLInputElement).value
   appIdFeedback.value = ''
+  appIdSuggestions.value = []
   detailsFieldTracker.schedule('onboarding_app_id_entered', 'app_id', manualAppId.value)
 }
 
@@ -1016,6 +1147,10 @@ function onStoreUrlInput(event: Event) {
   detailsFieldTracker.schedule('onboarding_store_url_entered', 'store_url', (event.target as HTMLInputElement).value)
 }
 
+function onIconStoreUrlInput(event: Event) {
+  detailsFieldTracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url', (event.target as HTMLInputElement).value)
+}
+
 function openAppIdHelp() {
   trackDetailsEvent('onboarding_app_id_help_opened')
   dialogStore.openDialog({
@@ -1034,6 +1169,71 @@ function applyAppIdSuggestion(suggestion: string) {
   hasEditedAppId.value = true
   manualAppId.value = suggestion
   appIdFeedback.value = ''
+  appIdSuggestions.value = []
+  trackDetailsEvent('onboarding_app_id_suggestion_selected', { app_id_source: 'manual' })
+}
+
+function completeAndViewAppDetailsStep(nextDetailsStep: AppDetailsStep) {
+  const previousAnalyticsStep = analyticsStepFor('details')
+  const nextAnalyticsStep = analyticsStepFor('details', nextDetailsStep)
+  progressTracker?.completeStep(previousAnalyticsStep, { nextStep: nextAnalyticsStep })
+  appDetailsStep.value = nextDetailsStep
+  progressTracker?.viewStep(nextAnalyticsStep, previousAnalyticsStep)
+  schedulePersistOnboardingProgress()
+}
+
+function continueFromAppName() {
+  if (!appName.value.trim()) {
+    toast.error(t('app-onboarding-toast-name-required'))
+    return
+  }
+
+  completeAndViewAppDetailsStep('app_id')
+}
+
+function continueFromAppId() {
+  if (!ensureValidAppId())
+    return
+
+  completeAndViewAppDetailsStep('icon')
+}
+
+function skipAppId() {
+  manualAppId.value = ''
+  hasEditedAppId.value = false
+  appIdFeedback.value = ''
+  appIdSuggestions.value = []
+  continueFromAppId()
+}
+
+function continueFromCurrentAppDetailsStep() {
+  if (appDetailsStep.value === 'name') {
+    continueFromAppName()
+    return
+  }
+  if (appDetailsStep.value === 'app_id') {
+    if (hasProvidedAppId.value)
+      continueFromAppId()
+    else
+      skipAppId()
+    return
+  }
+  finishAppDetails()
+}
+
+function viewPreviousAppDetailsStep() {
+  const previousDetailsStep = appDetailsStep.value
+  const previousAnalyticsStep = analyticsStepFor('details')
+  appDetailsStep.value = previousDetailsStep === 'icon' ? 'app_id' : 'name'
+  progressTracker?.viewStep(analyticsStepFor('details'), previousAnalyticsStep)
+  schedulePersistOnboardingProgress()
+}
+
+function finishAppDetails() {
+  if (props.preOrg)
+    continuePreOrgDetails()
+  else
+    void createAppRecord()
 }
 
 async function uploadIcon(appId: string, iconSourceUrl?: string) {
@@ -1139,8 +1339,10 @@ function restoreDraftState() {
   existingAppSetup.value = draft.existingAppSetup
   storeUrl.value = draft.storeUrl
   importedStoreAppId.value = draft.importedStoreAppId
-  if (draft.storeIconDataUrl)
+  if (draft.storeIconDataUrl) {
     storeIconPreview.value = draft.storeIconDataUrl
+    useImportedStoreIcon.value = !draft.iconDataUrl
+  }
   if (draft.storeScreenshotUrl)
     storeScreenshotPreview.value = draft.storeScreenshotUrl
   if (draft.iconDataUrl)
@@ -1335,6 +1537,14 @@ async function createAppRecord(options?: { nextStep?: StandardFlowStep | PreOrgF
     return
 
   isSubmitting.value = true
+  const creationAppIdSource = selectedAppIdSource.value
+  const creationIconSource = selectedAppIconSource.value
+  let creationFailureTracked = false
+  trackDetailsEvent('onboarding_app_creation_started', {
+    app_id_source: creationAppIdSource,
+    has_icon: creationIconSource !== 'none',
+    icon_source: creationIconSource,
+  })
   try {
     const normalizedStoreUrls = existingApp.value === true && existingAppSetup.value === 'import'
       ? getStoreUrls(storeUrl.value.trim())
@@ -1357,6 +1567,13 @@ async function createAppRecord(options?: { nextStep?: StandardFlowStep | PreOrgF
 
     if (createResult.ok === false) {
       if (createResult.reason === 'all_conflicts') {
+        creationFailureTracked = true
+        trackDetailsEvent('onboarding_app_creation_failed', {
+          app_id_source: creationAppIdSource,
+          failure_reason: 'all_conflicts',
+          has_icon: creationIconSource !== 'none',
+          icon_source: creationIconSource,
+        })
         appIdSuggestions.value = createResult.suggestions
         appIdFeedback.value = t('app-onboarding-appid-taken-pick-another', {
           appId: createResult.originalAppId,
@@ -1365,6 +1582,13 @@ async function createAppRecord(options?: { nextStep?: StandardFlowStep | PreOrgF
         return
       }
 
+      creationFailureTracked = true
+      trackDetailsEvent('onboarding_app_creation_failed', {
+        app_id_source: creationAppIdSource,
+        failure_reason: 'request_error',
+        has_icon: creationIconSource !== 'none',
+        icon_source: creationIconSource,
+      })
       appIdFeedback.value = createResult.message
       toast.error(appIdFeedback.value)
       throw createResult.error
@@ -1398,6 +1622,12 @@ async function createAppRecord(options?: { nextStep?: StandardFlowStep | PreOrgF
       .single()
 
     createdApp.value = refreshed ?? responseData
+    trackDetailsEvent('onboarding_app_creation_succeeded', {
+      app_id_source: creationAppIdSource,
+      has_icon: creationIconSource !== 'none',
+      icon_source: creationIconSource,
+      used_fallback: createResult.wasRetried,
+    })
     dashboardAppsStore.upsertApp({
       app_id: appId,
       name: appName.value.trim() || null,
@@ -1412,6 +1642,14 @@ async function createAppRecord(options?: { nextStep?: StandardFlowStep | PreOrgF
   }
   catch (error) {
     console.error('Cannot create onboarding app', error)
+    if (!creationFailureTracked) {
+      trackDetailsEvent('onboarding_app_creation_failed', {
+        app_id_source: creationAppIdSource,
+        failure_reason: 'request_error',
+        has_icon: creationIconSource !== 'none',
+        icon_source: creationIconSource,
+      })
+    }
     if (!appIdFeedback.value)
       toast.error(t('app-onboarding-toast-create-error'))
   }
@@ -1625,8 +1863,12 @@ onMounted(async () => {
 
     const resumed = await loadResumeApp()
     resumedFlow = resumed
-    if (!resumed)
+    if (!resumed) {
       flowStep.value = 'details'
+      appDetailsStep.value = 'name'
+      existingApp.value = true
+      existingAppSetup.value = 'manual'
+    }
 
     void loadApiKey().catch((error) => {
       console.error('Cannot ensure API key', error)
@@ -1685,7 +1927,8 @@ watch(existingApp, (value) => {
     return
   }
 
-  existingAppSetup.value = value === true ? null : value === false ? 'manual' : null
+  if (value !== true)
+    existingAppSetup.value = value === false ? 'manual' : null
   if (value !== true) {
     resetStoreImportState()
   }
@@ -1700,11 +1943,6 @@ watch(existingAppSetup, (value) => {
     resetStoreImportState()
 })
 
-watch(suggestedAppId, (value) => {
-  if (!hasEditedAppId.value && !createdApp.value)
-    manualAppId.value = value
-}, { immediate: true })
-
 watch(appName, (value) => {
   if (isHydratingOnboarding.value)
     return
@@ -1717,6 +1955,10 @@ watch([orgNameInput, storeUrl, selectedIntent, existingAppSetup, estimatedUsersI
   schedulePersistOnboardingProgress()
 })
 
+watch(appDetailsStep, () => {
+  schedulePersistOnboardingProgress()
+})
+
 defineExpose({
   persistOnboardingProgress,
 })
@@ -1816,16 +2058,37 @@ defineExpose({
                   {{ t('app-onboarding-step-details') }}
                 </p>
                 <h2 class="mt-2 text-2xl font-semibold text-slate-950 dark:text-white">
-                  {{ props.preOrg
-                    ? t('app-onboarding-v2-details-title')
-                    : t('app-onboarding-existing-question') }}
+                  {{ appDetailsStep === 'name'
+                    ? t('app-onboarding-name-step-title')
+                    : appDetailsStep === 'app_id'
+                      ? t('app-onboarding-app-id-step-title')
+                      : t('app-onboarding-icon-step-title') }}
                 </h2>
-                <p v-if="props.preOrg" class="mt-2 text-sm leading-6 text-slate-600 dark:text-slate-300">
-                  {{ t('app-onboarding-v2-details-helper') }}
+                <p class="mt-2 text-sm leading-6 text-slate-600 dark:text-slate-300">
+                  {{ appDetailsStep === 'name'
+                    ? t('app-onboarding-name-step-helper')
+                    : appDetailsStep === 'app_id'
+                      ? t('app-onboarding-app-id-step-helper')
+                      : t('app-onboarding-icon-step-helper') }}
                 </p>
               </div>
 
-              <div v-if="!props.preOrg" class="grid gap-3 sm:grid-cols-2">
+              <div v-if="appDetailsStep !== 'icon'" class="flex flex-col items-center py-1 text-center">
+                <div class="relative flex h-20 w-20 items-center justify-center overflow-hidden rounded-[1.4rem] bg-slate-950 text-white shadow-lg shadow-slate-950/15 ring-1 ring-white/10 dark:bg-white dark:text-slate-950 dark:shadow-black/20">
+                  <span class="absolute -right-3 -top-3 h-10 w-10 rounded-full bg-primary-500/90" aria-hidden="true" />
+                  <span class="absolute -bottom-4 -left-2 h-11 w-11 rounded-full bg-emerald-400/80" aria-hidden="true" />
+                  <span v-if="appNameInitial" class="relative text-2xl font-bold tracking-tight">{{ appNameInitial }}</span>
+                  <IconSparkles v-else class="relative h-7 w-7" aria-hidden="true" />
+                </div>
+                <p class="mt-3 max-w-full truncate text-base font-semibold text-slate-950 dark:text-white">
+                  {{ appName.trim() || t('app-onboarding-preview-placeholder') }}
+                </p>
+                <p v-if="appDetailsStep === 'app_id'" class="mt-1 max-w-full truncate font-mono text-xs text-slate-500 dark:text-slate-400">
+                  {{ generatedAppId }}
+                </p>
+              </div>
+
+              <div v-if="false" class="grid gap-3 sm:grid-cols-2">
                 <button
                   type="button"
                   :aria-pressed="existingApp === true"
@@ -1872,7 +2135,7 @@ defineExpose({
                 </button>
               </div>
 
-              <div v-if="!props.preOrg && existingApp === true" class="space-y-5 border-t border-slate-200 pt-6 dark:border-white/15">
+              <div v-if="false" class="space-y-5 border-t border-slate-200 pt-6 dark:border-white/15">
                 <div>
                   <p class="text-sm font-semibold text-slate-950 dark:text-white">
                     {{ t('app-onboarding-start-question') }}
@@ -1933,8 +2196,8 @@ defineExpose({
                 </template>
               </div>
 
-              <template v-if="canShowAppDetails">
-                <div class="flex items-center gap-4 rounded-xl border border-slate-200 bg-slate-50 p-4 dark:border-white/15 dark:bg-slate-950/90">
+              <div class="contents">
+                <div v-if="appDetailsStep === 'icon'" class="flex items-center gap-4 rounded-xl border border-slate-200 bg-slate-50 p-4 dark:border-white/15 dark:bg-slate-950/90">
                   <div class="flex h-14 w-14 shrink-0 items-center justify-center overflow-hidden rounded-2xl bg-slate-200 ring-1 ring-slate-300 dark:bg-slate-800 dark:ring-white/10">
                     <img v-if="iconPreview" :src="iconPreview" :alt="t('app-onboarding-icon-preview-alt')" class="h-full w-full object-cover">
                     <span v-else-if="isResumeIconLoading" class="h-5 w-5 rounded-full border-2 border-primary-500 border-t-transparent animate-spin" :aria-label="t('loading')" />
@@ -1950,7 +2213,7 @@ defineExpose({
                   </div>
                 </div>
 
-                <div>
+                <div v-if="appDetailsStep === 'name'" class="mb-6">
                   <label for="app-onboarding-name" class="text-sm font-medium text-slate-800 dark:text-slate-200">{{ t('app-name') }}</label>
                   <input
                     id="app-onboarding-name"
@@ -1963,31 +2226,31 @@ defineExpose({
                   >
                 </div>
 
-                <div>
+                <div v-if="appDetailsStep === 'app_id'">
                   <label for="app-onboarding-app-id" class="text-sm font-medium text-slate-800 dark:text-slate-200">{{ t('app-id') }}</label>
                   <input
                     id="app-onboarding-app-id"
                     :value="manualAppId"
                     class="mt-2 min-h-12 w-full rounded-xl border border-slate-300 bg-white px-4 font-mono text-sm text-slate-950 outline-none transition placeholder:text-slate-400 focus:border-primary-500 focus:ring-2 focus:ring-primary-500/10 dark:border-white/20 dark:bg-slate-950/90 dark:text-white dark:placeholder:text-slate-500 dark:focus:border-primary-500 dark:focus:ring-primary-500/30"
-                    :placeholder="t('app-onboarding-appid-placeholder')"
+                    :placeholder="suggestedAppId"
                     @input="onAppIdInput"
                   >
-                  <p class="mt-2 text-sm leading-6 text-slate-500 dark:text-slate-400">
-                    {{ props.preOrg
-                      ? t('app-onboarding-v2-appid-help')
-                      : existingApp
-                        ? t('app-onboarding-appid-help-existing')
-                        : t('app-onboarding-appid-help-new') }}
-                  </p>
-                  <button
-                    v-if="props.preOrg"
-                    type="button"
-                    class="mt-1 text-sm font-medium text-primary-500 underline-offset-2 hover:underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500"
-                    data-test="app-onboarding-appid-learn-more"
-                    @click="openAppIdHelp()"
-                  >
-                    {{ t('learn-more') }}
-                  </button>
+                  <div class="mt-2 flex flex-wrap items-baseline gap-x-2 gap-y-1 text-sm leading-6 text-slate-500 dark:text-slate-400">
+                    <i18n-t keypath="app-onboarding-app-id-generated-helper" tag="span">
+                      <template #appId>
+                        <code class="rounded bg-slate-100 px-1.5 py-0.5 font-mono text-xs font-medium text-slate-700 dark:bg-white/10 dark:text-slate-200">{{ suggestedAppId }}</code>
+                      </template>
+                    </i18n-t>
+                    <button
+                      v-if="props.preOrg"
+                      type="button"
+                      class="text-sm font-medium text-primary-500 underline-offset-2 hover:underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500"
+                      data-test="app-onboarding-appid-learn-more"
+                      @click="openAppIdHelp()"
+                    >
+                      {{ t('app-onboarding-app-id-learn-more') }}
+                    </button>
+                  </div>
                   <output v-if="appIdFeedback" class="mt-2 block text-sm font-medium text-amber-700 dark:text-amber-300" for="app-onboarding-app-id">
                     {{ appIdFeedback }}
                   </output>
@@ -2004,27 +2267,28 @@ defineExpose({
                   </div>
                 </div>
 
-                <div v-if="props.preOrg" class="overflow-hidden rounded-xl border border-slate-200 bg-slate-50 dark:border-white/15 dark:bg-slate-950/60">
+                <div v-if="appDetailsStep === 'app_id'" class="mb-6 mt-4 overflow-hidden rounded-xl border border-slate-200 bg-slate-50 dark:border-white/15 dark:bg-slate-950/60">
                   <button
                     type="button"
                     class="flex min-h-12 w-full items-center justify-between gap-3 px-4 py-3 text-left text-sm font-semibold text-slate-800 transition hover:bg-slate-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-primary-500 dark:text-slate-200 dark:hover:bg-slate-900"
-                    :aria-expanded="existingAppSetup === 'import'"
                     data-test="app-onboarding-toggle-store-import"
-                    @click="togglePreOrgStoreImport()"
+                    :aria-expanded="isStoreImportOpen"
+                    aria-controls="app-onboarding-store-import-panel"
+                    @click="toggleStoreImport"
                   >
                     <span class="flex items-center gap-2">
                       <IconStore class="h-4 w-4" />
-                      <span>{{ t('app-onboarding-v2-store-import-toggle') }}</span>
+                      {{ t('app-onboarding-v2-store-import-toggle') }}
                     </span>
-                    <IconChevronUp v-if="existingAppSetup === 'import'" class="h-4 w-4 shrink-0 text-slate-500" aria-hidden="true" />
+                    <IconChevronUp v-if="isStoreImportOpen" class="h-4 w-4 shrink-0 text-slate-500" aria-hidden="true" />
                     <IconChevronDown v-else class="h-4 w-4 shrink-0 text-slate-500" aria-hidden="true" />
                   </button>
 
-                  <div v-if="existingAppSetup === 'import'" class="border-t border-slate-200 p-4 dark:border-white/15">
+                  <div v-if="isStoreImportOpen" id="app-onboarding-store-import-panel" class="space-y-3 border-t border-slate-200 p-4 dark:border-white/15">
                     <label for="app-onboarding-v2-store-url" class="text-sm font-medium text-slate-800 dark:text-slate-200">
                       {{ t('app-onboarding-store-link-label') }}
                     </label>
-                    <div class="mt-2 space-y-3">
+                    <div class="space-y-3">
                       <input
                         id="app-onboarding-v2-store-url"
                         v-model="storeUrl"
@@ -2033,7 +2297,7 @@ defineExpose({
                         type="url"
                         @input="onStoreUrlInput"
                       >
-                      <button type="button" class="d-btn min-h-12 w-full sm:w-auto" :class="whiteCardPrimaryButtonClass()" :disabled="isImportingStore || !storeUrl" @click="importStoreMetadata()">
+                      <button type="button" class="d-btn min-h-11 w-full sm:w-auto" :class="whiteCardSecondaryButtonClass()" :disabled="isImportingStore || !storeUrl.trim()" @click="importStoreMetadata()">
                         <IconLoader v-if="isImportingStore" class="h-4 w-4 animate-spin" />
                         <IconSparkles v-else class="h-4 w-4" />
                         <span>{{ t('app-onboarding-store-import-button') }}</span>
@@ -2047,42 +2311,138 @@ defineExpose({
                   </div>
                 </div>
 
-                <div>
-                  <AppOnboardingIconInput
-                    :label="t('app-onboarding-icon-label')"
-                    :choose-label="t('app-onboarding-icon-choose-file')"
-                    :empty-label="t('app-onboarding-icon-no-file-selected')"
-                    @picker-closed-without-selection="onIconPickerClosedWithoutSelection"
-                    @picker-open-failed="onIconPickerOpenFailed"
-                    @picker-opened="onIconPickerOpened"
-                    @update:model-value="onSelectIconFormKit"
-                  />
-                  <p class="mt-2 text-sm leading-6 text-slate-500 dark:text-slate-400">
-                    {{ t('app-onboarding-icon-help') }}
-                  </p>
+                <div v-if="appDetailsStep === 'icon'">
+                  <div v-if="storeIconPreview" class="rounded-2xl border border-slate-200 bg-white p-4 dark:border-white/15 dark:bg-slate-950/70">
+                    <div class="flex flex-col gap-4 sm:flex-row sm:items-center">
+                      <img :src="storeIconPreview" :alt="t('app-onboarding-imported-icon-alt')" class="h-20 w-20 shrink-0 rounded-2xl border border-slate-200 bg-white object-cover shadow-sm dark:border-white/15">
+                      <div class="min-w-0 flex-1">
+                        <p class="text-xs font-semibold uppercase tracking-wide text-primary-500">
+                          {{ t('app-onboarding-imported-icon-label') }}
+                        </p>
+                        <p class="mt-1 truncate text-base font-semibold text-slate-950 dark:text-white">
+                          {{ storeAppNamePreview || appName }}
+                        </p>
+                        <p class="mt-1 text-sm text-slate-500 dark:text-slate-400">
+                          {{ t('app-onboarding-imported-icon-helper') }}
+                        </p>
+                      </div>
+                      <button
+                        type="button"
+                        class="d-btn min-h-11 shrink-0"
+                        :class="canUseStoreImportPreview ? whiteCardSecondaryButtonClass() : whiteCardPrimaryButtonClass()"
+                        :disabled="canUseStoreImportPreview"
+                        data-test="app-onboarding-use-imported-icon"
+                        @click="selectImportedIcon"
+                      >
+                        <IconCheck v-if="canUseStoreImportPreview" class="h-4 w-4" />
+                        {{ canUseStoreImportPreview ? t('app-onboarding-imported-icon-selected') : t('app-onboarding-use-imported-icon') }}
+                      </button>
+                    </div>
+                  </div>
+
+                  <div class="mt-5 rounded-2xl border border-slate-200 bg-slate-50 p-4 dark:border-white/15 dark:bg-slate-950/60">
+                    <AppOnboardingIconInput
+                      v-model="selectedIconFile"
+                      :label="t('app-onboarding-use-different-icon')"
+                      :choose-label="t('app-onboarding-icon-choose-file')"
+                      :empty-label="t('app-onboarding-icon-no-file-selected')"
+                      @picker-closed-without-selection="onIconPickerClosedWithoutSelection"
+                      @picker-open-failed="onIconPickerOpenFailed"
+                      @picker-opened="onIconPickerOpened"
+                      @update:model-value="onSelectIconFormKit"
+                    />
+                    <p class="mt-2 text-sm leading-6 text-slate-500 dark:text-slate-400">
+                      {{ t('app-onboarding-icon-help') }}
+                    </p>
+                    <button
+                      v-if="iconPreview"
+                      type="button"
+                      class="mt-3 inline-flex min-h-10 items-center gap-2 rounded-lg px-3 text-sm font-medium text-red-600 transition hover:bg-red-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-500 dark:text-red-300 dark:hover:bg-red-500/10"
+                      data-test="app-onboarding-remove-icon"
+                      @click="removeSelectedIcon"
+                    >
+                      <IconTrash class="h-4 w-4" />
+                      {{ t('app-onboarding-remove-icon') }}
+                    </button>
+                  </div>
+
+                  <div class="mb-6 mt-5 overflow-hidden rounded-xl border border-slate-200 bg-slate-50 dark:border-white/15 dark:bg-slate-950/60">
+                    <button
+                      type="button"
+                      class="flex min-h-12 w-full items-center justify-between gap-3 px-4 py-3 text-left text-sm font-semibold text-slate-800 transition hover:bg-slate-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-primary-500 dark:text-slate-200 dark:hover:bg-slate-900"
+                      data-test="app-onboarding-toggle-icon-store-import"
+                      :aria-expanded="isStoreIconImportOpen"
+                      aria-controls="app-onboarding-icon-store-import-panel"
+                      @click="toggleStoreIconImport"
+                    >
+                      <span class="flex items-center gap-2">
+                        <IconStore class="h-4 w-4" />
+                        {{ t('app-onboarding-import-icon-only-title') }}
+                      </span>
+                      <IconChevronUp v-if="isStoreIconImportOpen" class="h-4 w-4 shrink-0 text-slate-500" aria-hidden="true" />
+                      <IconChevronDown v-else class="h-4 w-4 shrink-0 text-slate-500" aria-hidden="true" />
+                    </button>
+
+                    <div v-if="isStoreIconImportOpen" id="app-onboarding-icon-store-import-panel" class="space-y-3 border-t border-slate-200 p-4 dark:border-white/15">
+                      <p class="text-sm leading-6 text-slate-500 dark:text-slate-400">
+                        {{ t('app-onboarding-import-icon-only-helper') }}
+                      </p>
+                      <div class="space-y-3">
+                        <input
+                          id="app-onboarding-icon-store-url"
+                          v-model="iconStoreUrl"
+                          class="min-h-12 w-full rounded-xl border border-slate-300 bg-white px-4 text-sm text-slate-950 outline-none transition placeholder:text-slate-400 focus:border-primary-500 focus:ring-2 focus:ring-primary-500/10 dark:border-white/20 dark:bg-slate-950/90 dark:text-white dark:placeholder:text-slate-500 dark:focus:border-primary-500 dark:focus:ring-primary-500/30"
+                          :placeholder="t('app-onboarding-store-link-placeholder')"
+                          type="url"
+                          @input="onIconStoreUrlInput"
+                        >
+                        <button type="button" class="d-btn min-h-11 w-full sm:w-auto" :class="whiteCardSecondaryButtonClass()" :disabled="isImportingStoreIcon || !iconStoreUrl.trim()" data-test="app-onboarding-import-icon-only" @click="importStoreIcon">
+                          <IconLoader v-if="isImportingStoreIcon" class="h-4 w-4 animate-spin" />
+                          <IconSparkles v-else class="h-4 w-4" />
+                          {{ t('app-onboarding-import-icon-only-button') }}
+                        </button>
+                      </div>
+                    </div>
+                  </div>
                 </div>
 
-                <div v-if="storeScreenshotPreview" class="overflow-hidden rounded-xl border border-slate-200 dark:border-white/15">
+                <div v-if="false && storeScreenshotPreview" class="overflow-hidden rounded-xl border border-slate-200 dark:border-white/15">
                   <img :src="storeScreenshotPreview" :alt="t('app-onboarding-store-screenshot-alt')" class="mx-auto aspect-9/19.5 max-h-48 w-auto object-cover object-top">
                 </div>
 
                 <div class="flex flex-col-reverse gap-3 border-t border-slate-200 pt-6 sm:flex-row sm:items-center sm:justify-between dark:border-white/15">
-                  <button type="button" class="d-btn min-h-12" :class="whiteCardSecondaryButtonClass()" @click="props.preOrg ? viewPreviousStep('intent') : router.push('/apps')">
-                    {{ props.preOrg ? t('button-back') : t('button-cancel') }}
-                  </button>
                   <button
                     type="button"
-                    class="d-btn min-h-12" :class="whiteCardPrimaryButtonClass()" :disabled="isSubmitting" data-test="app-onboarding-continue"
-                    @click="props.preOrg ? continuePreOrgDetails() : createAppRecord()"
+                    class="d-btn min-h-12"
+                    :class="whiteCardSecondaryButtonClass()"
+                    @click="appDetailsStep === 'name' ? (props.preOrg ? viewPreviousStep('intent') : router.push('/apps')) : viewPreviousAppDetailsStep()"
                   >
-                    <IconLoader v-if="isSubmitting" class="h-4 w-4 animate-spin" />
-                    <span v-else>{{ t('app-onboarding-continue') }}</span>
-                    <IconArrowRight v-if="!isSubmitting" class="h-4 w-4" />
+                    {{ appDetailsStep === 'name' && !props.preOrg ? t('button-cancel') : t('button-back') }}
                   </button>
+                  <div class="flex flex-col gap-3 sm:flex-row sm:items-center">
+                    <button
+                      type="button"
+                      class="d-btn min-h-12"
+                      :class="whiteCardPrimaryButtonClass()"
+                      :disabled="isSubmitting"
+                      :data-test="appDetailsStep === 'app_id' && !hasProvidedAppId ? 'app-onboarding-skip-app-id' : 'app-onboarding-continue'"
+                      @click="continueFromCurrentAppDetailsStep"
+                    >
+                      <IconLoader v-if="isSubmitting" class="h-4 w-4 animate-spin" />
+                      <span v-else>{{ appDetailsStep === 'icon'
+                        ? props.preOrg
+                          ? t('app-onboarding-continue')
+                          : t('app-onboarding-finish-details')
+                        : appDetailsStep === 'app_id' && !hasProvidedAppId
+                          ? t('app-onboarding-skip-app-id')
+                          : t('app-onboarding-continue') }}</span>
+                      <IconArrowRight v-if="!isSubmitting" class="h-4 w-4" />
+                    </button>
+                  </div>
                 </div>
-              </template>
+              </div>
 
-              <div v-if="!props.preOrg" class="pt-1">
+              <div v-if="!props.preOrg && appDetailsStep === 'icon'" class="pt-1">
                 <button
                   v-if="!isCliCommandVisible"
                   type="button"
diff --git a/src/components/dashboard/AppOnboardingIconInput.vue b/src/components/dashboard/AppOnboardingIconInput.vue
index 90ef6025cc..e8c6e699e6 100644
--- a/src/components/dashboard/AppOnboardingIconInput.vue
+++ b/src/components/dashboard/AppOnboardingIconInput.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, useId } from 'vue'
+import { ref, useId, watch } from 'vue'
 
 defineProps<{
   chooseLabel: string
@@ -18,6 +18,14 @@ const fileInputId = `app-onboarding-icon-input-${useId()}`
 const fileInput = ref<HTMLInputElement | null>(null)
 const selectedFileName = ref('')
 
+watch(modelValue, (value) => {
+  if (value)
+    return
+  selectedFileName.value = ''
+  if (fileInput.value)
+    fileInput.value.value = ''
+})
+
 function openFilePicker() {
   try {
     if (!fileInput.value)
diff --git a/src/utils/onboardingProgressAnalytics.ts b/src/utils/onboardingProgressAnalytics.ts
index 8ef59313f0..56adc5a276 100644
--- a/src/utils/onboardingProgressAnalytics.ts
+++ b/src/utils/onboardingProgressAnalytics.ts
@@ -3,7 +3,7 @@ import { pushEvent } from '~/services/posthog'
 export const ONBOARDING_ANALYTICS_VERSION = 3
 
 export type OnboardingAnalyticsFlow = 'pre_org' | 'existing_org'
-export type OnboardingAnalyticsStep = 'intent' | 'details' | 'organization' | 'choice' | 'install' | 'setup'
+export type OnboardingAnalyticsStep = 'intent' | 'details' | 'app_name' | 'app_id' | 'app_icon' | 'organization' | 'choice' | 'install' | 'setup'
 export type OnboardingCopyEvent = 'onboarding_ai_instructions_copied' | 'onboarding_cli_command_copied'
 export type OnboardingIntent = 'ota' | 'builder' | 'both' | 'exploring'
 export type OnboardingInteractionEvent
@@ -18,8 +18,14 @@ export type OnboardingInteractionEvent
     | 'onboarding_technical_invite_opened'
     | 'onboarding_technical_invite_succeeded'
 export type OnboardingDetailsEvent
-  = | 'onboarding_app_id_entered'
+  = | 'onboarding_app_creation_failed'
+    | 'onboarding_app_creation_started'
+    | 'onboarding_app_creation_succeeded'
+    | 'onboarding_app_icon_import_selected'
+    | 'onboarding_app_icon_removed'
+    | 'onboarding_app_id_entered'
     | 'onboarding_app_id_help_opened'
+    | 'onboarding_app_id_suggestion_selected'
     | 'onboarding_app_icon_picked'
     | 'onboarding_app_icon_picker_closed_without_selection'
     | 'onboarding_app_icon_picker_open_failed'
@@ -32,6 +38,12 @@ export type OnboardingDetailsEvent
     | 'onboarding_store_import_shown'
     | 'onboarding_store_import_submitted'
     | 'onboarding_store_import_succeeded'
+    | 'onboarding_store_icon_import_failed'
+    | 'onboarding_store_icon_import_hidden'
+    | 'onboarding_store_icon_import_shown'
+    | 'onboarding_store_icon_import_submitted'
+    | 'onboarding_store_icon_import_succeeded'
+    | 'onboarding_store_icon_url_entered'
     | 'onboarding_store_url_entered'
 
 type AnalyticsPrimitive = string | number | boolean
@@ -60,8 +72,12 @@ export interface OnboardingStepCompletionProperties {
 }
 
 export interface OnboardingDetailsEventProperties {
+  app_id_source?: 'generated' | 'manual' | 'store'
+  failure_reason?: 'all_conflicts' | 'request_error'
   field_length?: number
-  icon_source?: 'file' | 'store'
+  has_icon?: boolean
+  icon_source?: 'file' | 'none' | 'store'
+  used_fallback?: boolean
 }
 
 export interface OnboardingInteractionProperties {
@@ -76,7 +92,7 @@ export interface OnboardingCopyEventProperties {
   setup_command: 'builder' | 'ota'
 }
 
-export type OnboardingDetailsField = 'app_id' | 'app_name' | 'store_url'
+export type OnboardingDetailsField = 'app_id' | 'app_name' | 'icon_store_url' | 'store_url'
 
 export function createOnboardingDetailsFieldDebouncer(
   emit: (name: OnboardingDetailsEvent, properties: OnboardingDetailsEventProperties) => void,
@@ -270,8 +286,12 @@ export function createOnboardingProgressTracker(options: CreateOnboardingProgres
     safelyCapture('onboarding_step_completed', properties)
   }
 
-  function trackDetailsEvent(name: OnboardingDetailsEvent, details: OnboardingDetailsEventProperties = {}) {
-    const properties = sharedProperties('details')
+  function trackDetailsEvent(
+    name: OnboardingDetailsEvent,
+    details: OnboardingDetailsEventProperties = {},
+    step: OnboardingAnalyticsStep = 'details',
+  ) {
+    const properties = sharedProperties(step)
     if (!properties)
       return
 
diff --git a/src/utils/userOnboardingProgress.ts b/src/utils/userOnboardingProgress.ts
index e9a8764214..c64fd4f4b0 100644
--- a/src/utils/userOnboardingProgress.ts
+++ b/src/utils/userOnboardingProgress.ts
@@ -1,6 +1,5 @@
 import type {
   OnboardingAnalyticsFlow,
-  OnboardingAnalyticsStep,
   OnboardingIntent,
 } from '~/utils/onboardingProgressAnalytics'
 
@@ -8,14 +7,18 @@ export const USER_ONBOARDING_STATUSES = ['in_progress', 'completed', 'abandoned'
 export const USER_ONBOARDING_STEPS = ['intent', 'details', 'organization', 'choice', 'install', 'setup'] as const
 export const USER_ONBOARDING_FLOWS = ['pre_org', 'existing_org'] as const
 export const USER_ONBOARDING_INTENTS = ['ota', 'builder', 'both', 'exploring'] as const
+export const USER_ONBOARDING_DETAILS_STEPS = ['name', 'app_id', 'icon'] as const
 
 export type UserOnboardingStatus = typeof USER_ONBOARDING_STATUSES[number]
+export type UserOnboardingStep = typeof USER_ONBOARDING_STEPS[number]
+export type UserOnboardingDetailsStep = typeof USER_ONBOARDING_DETAILS_STEPS[number]
 
 export interface UserOnboardingProgress {
   status: UserOnboardingStatus
-  step: OnboardingAnalyticsStep
+  step: UserOnboardingStep
   flow: OnboardingAnalyticsFlow
   intent?: OnboardingIntent
+  details_step?: UserOnboardingDetailsStep
   app_name?: string
   app_id?: string
   existing_app?: boolean | null
@@ -32,9 +35,10 @@ export interface UserOnboardingProgress {
 
 export interface UserOnboardingProgressInput {
   status: UserOnboardingStatus
-  step: OnboardingAnalyticsStep
+  step: UserOnboardingStep
   flow: OnboardingAnalyticsFlow
   intent?: OnboardingIntent | null
+  detailsStep?: UserOnboardingDetailsStep
   appName?: string
   appId?: string
   existingApp?: boolean | null
@@ -118,6 +122,9 @@ function applyOptionalUserOnboardingFields(
   if (isOneOf(raw.intent, USER_ONBOARDING_INTENTS))
     progress.intent = raw.intent
 
+  if (isOneOf(raw.details_step, USER_ONBOARDING_DETAILS_STEPS))
+    progress.details_step = raw.details_step
+
   const appName = optionalTrimmedString(raw.app_name)
   if (appName)
     progress.app_name = appName
@@ -199,6 +206,9 @@ export function buildUserOnboardingProgress(input: UserOnboardingProgressInput):
   if (input.intent)
     progress.intent = input.intent
 
+  if (input.detailsStep)
+    progress.details_step = input.detailsStep
+
   const appName = optionalTrimmedString(input.appName)
   if (appName)
     progress.app_name = appName
@@ -241,9 +251,9 @@ export function buildUserOnboardingProgress(input: UserOnboardingProgressInput):
 }
 
 export function clampResumableOnboardingStep(
-  step: OnboardingAnalyticsStep,
+  step: UserOnboardingStep,
   flow: OnboardingAnalyticsFlow,
-): OnboardingAnalyticsStep {
+): UserOnboardingStep {
   if (flow === 'pre_org' && (step === 'choice' || step === 'install' || step === 'setup'))
     return 'organization'
   return step
diff --git a/supabase/functions/_backend/utils/frontend_onboarding_analytics.ts b/supabase/functions/_backend/utils/frontend_onboarding_analytics.ts
index 7358108dbe..ac4564e53a 100644
--- a/supabase/functions/_backend/utils/frontend_onboarding_analytics.ts
+++ b/supabase/functions/_backend/utils/frontend_onboarding_analytics.ts
@@ -21,8 +21,14 @@ export const FRONTEND_ONBOARDING_ATTEMPT_LIMIT = 50_000
 export const FRONTEND_ONBOARDING_MAX_RANGE_MS = 365 * 24 * 60 * 60 * 1000
 
 const ONBOARDING_INTERACTION_EVENTS = [
+  'onboarding_app_creation_failed',
+  'onboarding_app_creation_started',
+  'onboarding_app_creation_succeeded',
+  'onboarding_app_icon_import_selected',
+  'onboarding_app_icon_removed',
   'onboarding_app_id_entered',
   'onboarding_app_id_help_opened',
+  'onboarding_app_id_suggestion_selected',
   'onboarding_app_icon_picked',
   'onboarding_app_icon_picker_closed_without_selection',
   'onboarding_app_icon_picker_open_failed',
@@ -35,6 +41,12 @@ const ONBOARDING_INTERACTION_EVENTS = [
   'onboarding_store_import_shown',
   'onboarding_store_import_submitted',
   'onboarding_store_import_succeeded',
+  'onboarding_store_icon_import_failed',
+  'onboarding_store_icon_import_hidden',
+  'onboarding_store_icon_import_shown',
+  'onboarding_store_icon_import_submitted',
+  'onboarding_store_icon_import_succeeded',
+  'onboarding_store_icon_url_entered',
   'onboarding_store_url_entered',
   'onboarding_organization_import_opened',
   'onboarding_organization_import_submitted',
@@ -194,7 +206,7 @@ export function buildFrontendOnboardingHogql(startDate: string, cohortEndDate: s
         attempt_id,
         toString(argMin(person_id, timestamp)) AS person_id,
         toUnixTimestamp64Milli(minIf(timestamp, event = 'onboarding_step_viewed' AND step = 'intent')) AS intent_ms,
-        toUnixTimestamp64Milli(minIf(timestamp, event = 'onboarding_step_viewed' AND step = 'details')) AS details_ms,
+        toUnixTimestamp64Milli(minIf(timestamp, event = 'onboarding_step_viewed' AND step IN ('details', 'app_name'))) AS details_ms,
         toUnixTimestamp64Milli(minIf(timestamp, event = 'onboarding_step_viewed' AND step = 'organization')) AS organization_ms,
         toUnixTimestamp64Milli(minIf(timestamp, event = 'onboarding_step_viewed' AND step = 'setup')) AS setup_ms,
         groupUniqArrayIf(tuple(event, toUnixTimestamp64Milli(timestamp)), event IN (${interactionEventAllowlist})) AS interaction_events,
diff --git a/tests/app-onboarding-apikey-loading.unit.test.ts b/tests/app-onboarding-apikey-loading.unit.test.ts
index af259f6caa..f5f13f23b0 100644
--- a/tests/app-onboarding-apikey-loading.unit.test.ts
+++ b/tests/app-onboarding-apikey-loading.unit.test.ts
@@ -6,7 +6,7 @@ const englishMessages = JSON.parse(readFileSync(new URL('../messages/en.json', i
 
 describe('app onboarding API key loading state', () => {
   it.concurrent('does not render the terminal alternative before an organization exists', () => {
-    expect(onboardingSource).toContain('<div v-if="!props.preOrg" class="pt-1">')
+    expect(onboardingSource).toContain('<div v-if="!props.preOrg && appDetailsStep === \'icon\'" class="pt-1">')
   })
 
   it.concurrent('replaces every incomplete CLI command with the shared loading treatment', () => {
diff --git a/tests/app-onboarding-progress-integration.unit.test.ts b/tests/app-onboarding-progress-integration.unit.test.ts
index 5f817785f1..68b3a837b8 100644
--- a/tests/app-onboarding-progress-integration.unit.test.ts
+++ b/tests/app-onboarding-progress-integration.unit.test.ts
@@ -29,14 +29,15 @@ describe('app onboarding progress analytics integration', () => {
 
     const initializer = sourceBetween('function initializeProgressTracking(', 'function completeAndViewStep(')
     expect(initializer).toContain(`flow: props.preOrg ? 'pre_org' : 'existing_org'`)
-    expect(initializer).toContain('const trackedSteps = appOnboardingSteps.value.map(step => step.id)')
+    expect(initializer).toContain('const trackedSteps = appOnboardingSteps.value.flatMap<OnboardingAnalyticsStep>')
+    expect(initializer).toContain('return Object.values(APP_DETAILS_ANALYTICS_STEPS)')
     expect(initializer).toContain(`if (!props.preOrg && resumed && flowStep.value === 'setup')`)
     expect(initializer).toContain(`trackedSteps.push('setup')`)
     expect(initializer).toContain('steps: trackedSteps')
     expect(initializer).toContain('resumed,')
     expect(initializer).toContain('onboardingAttemptId: onboardingTelemetry.attemptId')
     expect(initializer).toContain('onboardingRunId: onboardingTelemetry.runId')
-    expect(initializer).toContain('progressTracker.viewStep(flowStep.value)')
+    expect(initializer).toContain('progressTracker.viewStep(analyticsStepFor(flowStep.value))')
     expect(initializer.match(/\.viewStep\(/g)).toHaveLength(1)
 
     const resumeDialog = sourceBetween('async function maybeResumeSavedOnboarding()', 'function whiteCardToggleButtonClass(')
@@ -235,9 +236,9 @@ describe('app onboarding progress analytics integration', () => {
 
   it.concurrent('tracks only successful forward transitions with approved context', () => {
     const transitionHelpers = sourceBetween('function completeAndViewStep(', 'function whiteCardToggleButtonClass(')
-    expect(transitionHelpers).toContain('progressTracker?.completeStep(previousStep, {')
-    expect(transitionHelpers).toContain('nextStep,')
-    expect(transitionHelpers).toContain('progressTracker?.viewStep(nextStep, previousStep)')
+    expect(transitionHelpers).toContain('progressTracker?.completeStep(previousAnalyticsStep, {')
+    expect(transitionHelpers).toContain('nextStep: nextAnalyticsStep,')
+    expect(transitionHelpers).toContain('progressTracker?.viewStep(nextAnalyticsStep, previousAnalyticsStep)')
     expect(transitionHelpers).toContain('void persistOnboardingProgress()')
 
     const intentTransition = sourceBetween('function continueFromIntent()', 'function continuePreOrgDetails()')
@@ -260,7 +261,7 @@ describe('app onboarding progress analytics integration', () => {
   it.concurrent('reports back navigation as a new view without completing the abandoned step', () => {
     const backNavigation = sourceBetween('function viewPreviousStep(', 'function whiteCardToggleButtonClass(')
     expect(backNavigation).not.toContain('completeStep')
-    expect(backNavigation).toContain('progressTracker?.viewStep(nextStep, previousStep)')
+    expect(backNavigation).toContain('progressTracker?.viewStep(nextAnalyticsStep, previousAnalyticsStep)')
     expect(onboardingSource).toContain('@click="viewPreviousStep(\'choice\')"')
     expect(onboardingSource).toContain('@click="viewPreviousStep(\'details\')"')
     expect(onboardingSource).toContain(`props.preOrg ? viewPreviousStep('intent') : router.push('/apps')`)
diff --git a/tests/app-onboarding-v3.unit.test.ts b/tests/app-onboarding-v3.unit.test.ts
index 7e080bb44c..f2bd2a5acf 100644
--- a/tests/app-onboarding-v3.unit.test.ts
+++ b/tests/app-onboarding-v3.unit.test.ts
@@ -5,35 +5,136 @@ const onboardingSource = readFileSync(new URL('../src/components/dashboard/AppOn
 const iconInputSource = readFileSync(new URL('../src/components/dashboard/AppOnboardingIconInput.vue', import.meta.url), 'utf8')
 
 describe('pre-organization onboarding v3', () => {
-  it.concurrent('keeps store import optional and inline for pre-organization onboarding', () => {
-    expect(onboardingSource).toContain('data-test="app-onboarding-toggle-store-import"')
-    expect(onboardingSource).toContain(':aria-expanded="existingAppSetup === \'import\'"')
+  it.concurrent('splits app details into name, App ID, and icon screens', () => {
+    expect(onboardingSource).toContain("type AppDetailsStep = 'name' | 'app_id' | 'icon'")
+    expect(onboardingSource).toContain("const appDetailsStep = ref<AppDetailsStep>('name')")
+    expect(onboardingSource).toContain('const hasProvidedAppId = computed(() => Boolean(manualAppId.value.trim() || importedStoreAppId.value.trim()))')
+    expect(onboardingSource).toContain("completeAndViewAppDetailsStep('app_id')")
+    expect(onboardingSource).toContain("completeAndViewAppDetailsStep('icon')")
+    expect(onboardingSource).toContain(":data-test=\"appDetailsStep === 'app_id' && !hasProvidedAppId ? 'app-onboarding-skip-app-id' : 'app-onboarding-continue'\"")
+    expect(onboardingSource).toContain('function skipAppId()')
+    expect(onboardingSource).toContain('function continueFromCurrentAppDetailsStep()')
+    expect(onboardingSource).toContain('manualAppId.value = \'\'')
+    expect(onboardingSource).toContain('continueFromAppId()')
+    expect(onboardingSource).not.toContain('@click="skipAppId"')
+    expect(onboardingSource).toContain('<div v-if="appDetailsStep === \'name\'" class="mb-6">')
+  })
+
+  it.concurrent('validates the generated or entered App ID before either action advances', () => {
+    const appIdContinuation = onboardingSource.slice(
+      onboardingSource.indexOf('function continueFromAppId()'),
+      onboardingSource.indexOf('function viewPreviousAppDetailsStep()'),
+    )
+    expect(appIdContinuation).toContain('if (!ensureValidAppId())')
+    expect(appIdContinuation).toContain('function skipAppId()')
+    expect(appIdContinuation).toContain('continueFromAppId()')
+    expect(onboardingSource).not.toContain('app/availability')
+  })
+
+  it.concurrent('keeps the full store import on the App ID screen', () => {
     expect(onboardingSource).toContain('id="app-onboarding-v2-store-url"')
+    expect(onboardingSource).toContain("const isStoreImportOpen = ref(false)")
+    expect(onboardingSource).toContain('data-test="app-onboarding-toggle-store-import"')
+    expect(onboardingSource).toContain(':aria-expanded="isStoreImportOpen"')
+    expect(onboardingSource).toContain('v-if="isStoreImportOpen" id="app-onboarding-store-import-panel"')
+    expect(onboardingSource).toContain("trackDetailsEvent(isStoreImportOpen.value ? 'onboarding_store_import_shown' : 'onboarding_store_import_hidden')")
     expect(onboardingSource).toContain('// Store publication is unrelated to whether the user already has a mobile project.')
     expect(onboardingSource).toContain('existingApp.value = true')
-    expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_import_shown')")
-    expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_import_hidden')")
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_import_submitted'")
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_import_succeeded'")
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_import_failed'")
     expect(onboardingSource).not.toContain("{ store_url: requestedUrl }")
     const storeImport = onboardingSource.slice(
-      onboardingSource.indexOf('data-test="app-onboarding-toggle-store-import"'),
-      onboardingSource.indexOf('<AppOnboardingIconInput'),
+      onboardingSource.indexOf('id="app-onboarding-v2-store-url"'),
+      onboardingSource.indexOf("<div v-if=\"appDetailsStep === 'icon'\">"),
     )
-    expect(storeImport).toContain('<IconChevronUp v-if="existingAppSetup === \'import\'"')
-    expect(storeImport).toContain('class="mt-2 space-y-3"')
-    expect(storeImport).toContain('class="d-btn min-h-12 w-full sm:w-auto"')
+    expect(storeImport).toContain('class="d-btn min-h-11 w-full sm:w-auto"')
+  })
+
+  it.concurrent('renders the generated App ID as code without swallowing sentence punctuation', () => {
+    expect(onboardingSource).toContain('keypath="app-onboarding-app-id-generated-helper"')
+    expect(onboardingSource).toContain('<template #appId>')
+    expect(onboardingSource).toContain('<code class="rounded bg-slate-100')
+    expect(onboardingSource).toContain('{{ suggestedAppId }}</code>')
+  })
+
+  it.concurrent('lets icon re-import change only the selected icon', () => {
+    const iconImport = onboardingSource.slice(
+      onboardingSource.indexOf('async function importStoreIcon()'),
+      onboardingSource.indexOf('function onSelectIconFormKit('),
+    )
+    expect(iconImport).toContain("invokeCapgoApi('app/store-metadata'")
+    expect(iconImport).toContain('storeIconPreview.value = importedIcon')
+    expect(iconImport).toContain('selectImportedIcon()')
+    expect(iconImport).not.toContain('appName.value =')
+    expect(iconImport).not.toContain('manualAppId.value =')
+    expect(iconImport).not.toContain('importedStoreAppId.value =')
+    expect(onboardingSource).toContain('data-test="app-onboarding-use-imported-icon"')
+    expect(onboardingSource).toContain('data-test="app-onboarding-remove-icon"')
+    expect(onboardingSource).toContain('data-test="app-onboarding-import-icon-only"')
+    expect(onboardingSource).toContain("const isStoreIconImportOpen = ref(false)")
+    expect(onboardingSource).toContain('data-test="app-onboarding-toggle-icon-store-import"')
+    expect(onboardingSource).toContain(':aria-expanded="isStoreIconImportOpen"')
+    expect(onboardingSource).toContain('v-if="isStoreIconImportOpen" id="app-onboarding-icon-store-import-panel"')
+    expect(onboardingSource).toContain('class="mb-6 mt-5 overflow-hidden rounded-xl')
+    const iconImportPanel = onboardingSource.slice(
+      onboardingSource.indexOf('id="app-onboarding-icon-store-import-panel"'),
+      onboardingSource.indexOf('<div v-if="false && storeScreenshotPreview"'),
+    )
+    expect(iconImportPanel).toContain('<div class="space-y-3">')
+    expect(iconImportPanel).toContain('class="d-btn min-h-11 w-full sm:w-auto"')
+    expect(iconImportPanel).not.toContain('sm:flex-row')
+  })
+
+  it.concurrent('tracks every app-details page as a standard onboarding step', () => {
+    expect(onboardingSource).toContain("type AppDetailsAnalyticsStep = 'app_name' | 'app_id' | 'app_icon'")
+    expect(onboardingSource).toContain("name: 'app_name'")
+    expect(onboardingSource).toContain("app_id: 'app_id'")
+    expect(onboardingSource).toContain("icon: 'app_icon'")
+    expect(onboardingSource).toContain("completeAndViewAppDetailsStep('app_id'")
+    expect(onboardingSource).toContain("completeAndViewAppDetailsStep('icon'")
+    expect(onboardingSource).not.toContain('onboarding_app_details_step_viewed')
+    expect(onboardingSource).not.toContain('onboarding_app_details_step_completed')
+  })
+
+  it.concurrent('tracks app creation outcomes after the page-level funnel', () => {
+    expect(onboardingSource).toContain("trackDetailsEvent('onboarding_app_creation_started'")
+    expect(onboardingSource).toContain("trackDetailsEvent('onboarding_app_creation_succeeded'")
+    expect(onboardingSource).toContain("trackDetailsEvent('onboarding_app_creation_failed'")
+    expect(onboardingSource).toContain('app_id_source: creationAppIdSource')
+    expect(onboardingSource).toContain('icon_source: creationIconSource')
+    expect(onboardingSource).toContain('used_fallback: createResult.wasRetried')
+  })
+
+  it.concurrent('tracks icon-only store import interactions and outcomes', () => {
+    expect(onboardingSource).toContain("'onboarding_store_icon_import_shown' : 'onboarding_store_icon_import_hidden'")
+    expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_icon_import_submitted'")
+    expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_icon_import_succeeded'")
+    expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_icon_import_failed'")
+  })
+
+  it.concurrent('continues to organization creation after the pre-org icon step', () => {
+    expect(onboardingSource).toContain("? props.preOrg\n                          ? t('app-onboarding-continue')\n                          : t('app-onboarding-finish-details')")
   })
 
   it.concurrent('does not send raw onboarding field values to analytics', () => {
     expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_app_name_entered', 'app_name'")
     expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_app_id_entered', 'app_id'")
     expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_store_url_entered', 'store_url'")
+    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url'")
+    expect(onboardingSource).toContain('@input="onIconStoreUrlInput"')
     expect(onboardingSource).not.toContain('{ app_name:')
     expect(onboardingSource).not.toContain('{ store_url:')
   })
 
+  it.concurrent('maps the visual details section to page-level analytics steps', () => {
+    expect(onboardingSource).toContain('function analyticsStepFor(')
+    expect(onboardingSource).toContain('return APP_DETAILS_ANALYTICS_STEPS[detailsStep]')
+    expect(onboardingSource).toContain('progressTracker.viewStep(analyticsStepFor(flowStep.value))')
+    expect(onboardingSource).toContain('const previousAnalyticsStep = analyticsStepFor(previousStep)')
+    expect(onboardingSource).toContain('const nextAnalyticsStep = analyticsStepFor(nextStep)')
+  })
+
   it.concurrent('tracks native app icon picker and upload outcomes', () => {
     expect(iconInputSource).toContain("emit('pickerOpened')")
     expect(iconInputSource).toContain("emit('pickerOpenFailed')")
@@ -49,6 +150,9 @@ describe('pre-organization onboarding v3', () => {
     expect(appIdHelp).toContain("trackDetailsEvent('onboarding_app_id_help_opened')")
     expect(appIdHelp).toContain('dialogStore.openDialog({')
     expect(appIdHelp).not.toContain('onDialogDismiss')
+    expect(onboardingSource).toContain('class="mt-2 flex flex-wrap items-baseline gap-x-2 gap-y-1 text-sm leading-6')
+    expect(onboardingSource).toContain('keypath="app-onboarding-app-id-generated-helper" tag="span"')
+    expect(onboardingSource).toContain("t('app-onboarding-app-id-learn-more')")
   })
 
   it.concurrent('imports organization details and branches to invitations above Solo', () => {
diff --git a/tests/frontend-onboarding-analytics.unit.test.ts b/tests/frontend-onboarding-analytics.unit.test.ts
index f11d3e492e..7b0607d2cf 100644
--- a/tests/frontend-onboarding-analytics.unit.test.ts
+++ b/tests/frontend-onboarding-analytics.unit.test.ts
@@ -48,7 +48,13 @@ describe('buildFrontendOnboardingHogql', () => {
       '2026-08-04T00:00:00.789Z',
     )
 
-    expect(query).toContain("event IN ('onboarding_step_viewed', 'onboarding_ai_instructions_copied', 'onboarding_app_id_entered'")
+    expect(query).toContain("event IN ('onboarding_step_viewed', 'onboarding_ai_instructions_copied'")
+    expect(query).toContain("'onboarding_app_id_entered'")
+    expect(query).toContain("'onboarding_app_creation_succeeded'")
+    expect(query).not.toContain("'onboarding_app_details_step_completed'")
+    expect(query).not.toContain("'onboarding_app_details_step_viewed'")
+    expect(query).toContain("'onboarding_store_icon_import_succeeded'")
+    expect(query).toContain("'onboarding_store_icon_url_entered'")
     expect(query).toContain("'onboarding_organization_import_opened'")
     expect(query).toContain("'onboarding_organization_invite_succeeded'")
     expect(query).toContain("'onboarding_technical_invite_succeeded'")
@@ -68,7 +74,7 @@ describe('buildFrontendOnboardingHogql', () => {
     expect(query).toContain('event = \'Builder Onboarding Step\'')
     expect(query).toContain('JSONExtractString(toString(properties), \'step\') IN (\'welcome\', \'resume-prompt\')')
     expect(query).toContain('toUnixTimestamp64Milli(minIf(timestamp, event = \'onboarding_step_viewed\' AND step = \'intent\'))')
-    expect(query).toContain('toUnixTimestamp64Milli(minIf(timestamp, event = \'onboarding_step_viewed\' AND step = \'details\'))')
+    expect(query).toContain("toUnixTimestamp64Milli(minIf(timestamp, event = 'onboarding_step_viewed' AND step IN ('details', 'app_name'))) AS details_ms")
     expect(query).toContain('toUnixTimestamp64Milli(minIf(timestamp, event = \'onboarding_step_viewed\' AND step = \'organization\'))')
     expect(query).toContain('toUnixTimestamp64Milli(minIf(timestamp, event = \'onboarding_step_viewed\' AND step = \'setup\'))')
     expect(query).toContain('groupUniqArrayIf(tuple(event, toUnixTimestamp64Milli(timestamp)), event IN (')
diff --git a/tests/onboarding-details-field-debouncer.unit.test.ts b/tests/onboarding-details-field-debouncer.unit.test.ts
index edccf28427..ddc9948957 100644
--- a/tests/onboarding-details-field-debouncer.unit.test.ts
+++ b/tests/onboarding-details-field-debouncer.unit.test.ts
@@ -31,16 +31,19 @@ describe('onboarding details field analytics debounce', () => {
     tracker.schedule('onboarding_app_name_entered', 'app_name', '   ')
     tracker.schedule('onboarding_app_id_entered', 'app_id', 'com.example.app')
     tracker.schedule('onboarding_store_url_entered', 'store_url', 'https://apps.apple.com/example')
+    const iconStoreUrl = 'https://play.google.com/example'
+    tracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url', iconStoreUrl)
     vi.advanceTimersByTime(1_000)
 
-    expect(emit).toHaveBeenCalledTimes(2)
+    expect(emit).toHaveBeenCalledTimes(3)
     expect(emit).toHaveBeenCalledWith('onboarding_app_id_entered', { field_length: 15 })
     expect(emit).toHaveBeenCalledWith('onboarding_store_url_entered', { field_length: 30 })
+    expect(emit).toHaveBeenCalledWith('onboarding_store_icon_url_entered', { field_length: iconStoreUrl.length })
 
     tracker.schedule('onboarding_app_name_entered', 'app_name', 'Never emitted')
     tracker.dispose()
     vi.runAllTimers()
-    expect(emit).toHaveBeenCalledTimes(3)
+    expect(emit).toHaveBeenCalledTimes(4)
     expect(emit).toHaveBeenLastCalledWith('onboarding_app_name_entered', { field_length: 13 })
   })
 })
diff --git a/tests/onboarding-progress-analytics.unit.test.ts b/tests/onboarding-progress-analytics.unit.test.ts
index 6d742b8692..5e17643147 100644
--- a/tests/onboarding-progress-analytics.unit.test.ts
+++ b/tests/onboarding-progress-analytics.unit.test.ts
@@ -287,6 +287,64 @@ describe('onboarding progress analytics', () => {
     )
   })
 
+  it.concurrent('associates app-details interactions with their page-level analytics step', () => {
+    const capture = vi.fn()
+    const pageSteps = ['intent', 'app_name', 'app_id', 'app_icon', 'organization', 'setup'] as const
+    const tracker = createOnboardingProgressTracker({
+      ...trackerIdentity,
+      capture,
+      flow: 'pre_org',
+      resumed: false,
+      steps: pageSteps,
+      supaHost: 'https://supabase.capgo.test',
+    })
+
+    tracker.viewStep('app_name')
+    capture.mockClear()
+    tracker.trackDetailsEvent('onboarding_app_name_entered', { field_length: 11 }, 'app_name')
+
+    expect(capture).toHaveBeenCalledWith(
+      'onboarding_app_name_entered',
+      'https://supabase.capgo.test',
+      expect.objectContaining({
+        field_length: 11,
+        step: 'app_name',
+        step_index: 1,
+        total_steps: 6,
+      }),
+    )
+  })
+
+  it.concurrent('associates app creation outcomes with sanitized choice metadata', () => {
+    const capture = vi.fn()
+    const tracker = createOnboardingProgressTracker({
+      ...trackerIdentity,
+      capture,
+      flow: 'pre_org',
+      resumed: false,
+      steps,
+      supaHost: 'https://supabase.capgo.test',
+    })
+
+    tracker.trackDetailsEvent('onboarding_app_creation_succeeded', {
+      app_id_source: 'generated',
+      has_icon: true,
+      icon_source: 'store',
+      used_fallback: false,
+    })
+
+    expect(capture).toHaveBeenCalledWith(
+      'onboarding_app_creation_succeeded',
+      'https://supabase.capgo.test',
+      expect.objectContaining({
+        app_id_source: 'generated',
+        has_icon: true,
+        icon_source: 'store',
+        used_fallback: false,
+      }),
+    )
+  })
+
   it.concurrent('associates organization interactions with the active attempt', () => {
     const capture = vi.fn()
     const tracker = createOnboardingProgressTracker({
diff --git a/tests/user-onboarding-progress.unit.test.ts b/tests/user-onboarding-progress.unit.test.ts
index 7ab54992e1..7de4a100e5 100644
--- a/tests/user-onboarding-progress.unit.test.ts
+++ b/tests/user-onboarding-progress.unit.test.ts
@@ -22,6 +22,7 @@ describe('user onboarding progress', () => {
       step: 'organization',
       flow: 'pre_org',
       intent: 'ota',
+      details_step: 'icon',
       app_name: 'Acme',
       app_id: 'com.acme.app',
       existing_app: false,
@@ -34,6 +35,7 @@ describe('user onboarding progress', () => {
       step: 'organization',
       flow: 'pre_org',
       intent: 'ota',
+      details_step: 'icon',
       app_name: 'Acme',
       app_id: 'com.acme.app',
       existing_app: false,
@@ -66,6 +68,7 @@ describe('user onboarding progress', () => {
       step: 'details',
       flow: 'pre_org',
       intent: 'builder',
+      detailsStep: 'app_id',
       appName: '  Hello  ',
       appId: '',
       existingApp: true,
@@ -82,6 +85,7 @@ describe('user onboarding progress', () => {
       step: 'details',
       flow: 'pre_org',
       intent: 'builder',
+      details_step: 'app_id',
       app_name: 'Hello',
       existing_app: true,
       existing_app_setup: 'import',

From c33988b341729eff4310ef998b036c32bbfc5309 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 17 Aug 2026 20:29:24 +0200
Subject: [PATCH 02/10] fix(onboarding): address analytics quality findings

---
 .../dashboard/AppOnboardingFlow.vue           | 23 +++++++++++--------
 src/utils/onboardingProgressAnalytics.ts      | 22 ++++++++++--------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/components/dashboard/AppOnboardingFlow.vue b/src/components/dashboard/AppOnboardingFlow.vue
index 70b8a2febd..ae9fc0aee7 100644
--- a/src/components/dashboard/AppOnboardingFlow.vue
+++ b/src/components/dashboard/AppOnboardingFlow.vue
@@ -897,11 +897,11 @@ async function importStoreMetadata() {
         appName.value = storeAppNamePreview.value
     }
 
-    const importedIcon = typeof data?.icon_data_url === 'string' && data.icon_data_url.trim()
-      ? data.icon_data_url.trim()
-      : typeof data?.icon_url === 'string' && data.icon_url.trim()
-        ? data.icon_url.trim()
-        : ''
+    let importedIcon = ''
+    if (typeof data?.icon_data_url === 'string' && data.icon_data_url.trim())
+      importedIcon = data.icon_data_url.trim()
+    else if (typeof data?.icon_url === 'string' && data.icon_url.trim())
+      importedIcon = data.icon_url.trim()
     storeIconPreview.value = importedIcon
     if (importedIcon) {
       if (!localIconPreview.value)
@@ -954,11 +954,11 @@ async function importStoreIcon() {
     if (error)
       throw error
 
-    const importedIcon = typeof data?.icon_data_url === 'string' && data.icon_data_url.trim()
-      ? data.icon_data_url.trim()
-      : typeof data?.icon_url === 'string' && data.icon_url.trim()
-        ? data.icon_url.trim()
-        : ''
+    let importedIcon = ''
+    if (typeof data?.icon_data_url === 'string' && data.icon_data_url.trim())
+      importedIcon = data.icon_data_url.trim()
+    else if (typeof data?.icon_url === 'string' && data.icon_url.trim())
+      importedIcon = data.icon_url.trim()
     if (!importedIcon)
       throw new Error('Store metadata did not include an app icon')
 
@@ -2388,6 +2388,9 @@ defineExpose({
                         {{ t('app-onboarding-import-icon-only-helper') }}
                       </p>
                       <div class="space-y-3">
+                        <label for="app-onboarding-icon-store-url" class="sr-only">
+                          {{ t('app-onboarding-store-link-label') }}
+                        </label>
                         <input
                           id="app-onboarding-icon-store-url"
                           v-model="iconStoreUrl"
diff --git a/src/utils/onboardingProgressAnalytics.ts b/src/utils/onboardingProgressAnalytics.ts
index 56adc5a276..c02d9523eb 100644
--- a/src/utils/onboardingProgressAnalytics.ts
+++ b/src/utils/onboardingProgressAnalytics.ts
@@ -286,10 +286,10 @@ export function createOnboardingProgressTracker(options: CreateOnboardingProgres
     safelyCapture('onboarding_step_completed', properties)
   }
 
-  function trackDetailsEvent(
-    name: OnboardingDetailsEvent,
-    details: OnboardingDetailsEventProperties = {},
-    step: OnboardingAnalyticsStep = 'details',
+  function trackEvent(
+    name: OnboardingDetailsEvent | OnboardingInteractionEvent,
+    step: OnboardingAnalyticsStep,
+    details: OnboardingDetailsEventProperties | OnboardingInteractionProperties,
   ) {
     const properties = sharedProperties(step)
     if (!properties)
@@ -298,16 +298,20 @@ export function createOnboardingProgressTracker(options: CreateOnboardingProgres
     safelyCapture(name, { ...properties, ...details })
   }
 
+  function trackDetailsEvent(
+    name: OnboardingDetailsEvent,
+    details: OnboardingDetailsEventProperties = {},
+    step: OnboardingAnalyticsStep = 'details',
+  ) {
+    trackEvent(name, step, details)
+  }
+
   function trackStepEvent(
     name: OnboardingInteractionEvent,
     step: OnboardingAnalyticsStep,
     details: OnboardingInteractionProperties = {},
   ) {
-    const properties = sharedProperties(step)
-    if (!properties)
-      return
-
-    safelyCapture(name, { ...properties, ...details })
+    trackEvent(name, step, details)
   }
 
   function trackCopyEvent(name: OnboardingCopyEvent, details: OnboardingCopyEventProperties) {

From 5748ddd629f2dbe2ea7f556628279f018d04a2be Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 17 Aug 2026 20:39:15 +0200
Subject: [PATCH 03/10] fix(onboarding): address review feedback

---
 .../dashboard/AppOnboardingFlow.vue           | 101 +++++-------------
 src/utils/userOnboardingProgress.ts           |   1 +
 ...7_user_onboarding_details_step_comment.sql |   2 +
 tests/app-onboarding-file-input.unit.test.ts  |  43 +++++++-
 tests/app-onboarding-v3.unit.test.ts          |  18 +++-
 tests/user-onboarding-progress.unit.test.ts   |   7 ++
 6 files changed, 91 insertions(+), 81 deletions(-)
 create mode 100644 supabase/migrations/20260817183727_user_onboarding_details_step_comment.sql

diff --git a/src/components/dashboard/AppOnboardingFlow.vue b/src/components/dashboard/AppOnboardingFlow.vue
index ae9fc0aee7..e17e61ffe7 100644
--- a/src/components/dashboard/AppOnboardingFlow.vue
+++ b/src/components/dashboard/AppOnboardingFlow.vue
@@ -23,7 +23,6 @@ import IconArrowRight from '~icons/lucide/arrow-right'
 import IconCheck from '~icons/lucide/check'
 import IconChevronDown from '~icons/lucide/chevron-down'
 import IconChevronUp from '~icons/lucide/chevron-up'
-import IconCode from '~icons/lucide/code-2'
 import IconCompass from '~icons/lucide/compass'
 import IconGlobe from '~icons/lucide/globe-2'
 import IconInfo from '~icons/lucide/info'
@@ -453,9 +452,7 @@ function snapshotOnboardingProgress(status: UserOnboardingStatus = 'in_progress'
     intent: selectedIntent.value,
     detailsStep: appDetailsStep.value,
     appName: appName.value,
-    appId: flowStep.value === 'details' && appDetailsStep.value !== 'icon' && !manualAppId.value.trim() && !importedStoreAppId.value
-      ? ''
-      : generatedAppId.value,
+    appId: selectedAppIdSource.value === 'generated' ? '' : generatedAppId.value,
     existingApp: existingApp.value,
     existingAppSetup: existingAppSetup.value,
     storeUrl: storeUrl.value,
@@ -570,8 +567,8 @@ function resetOnboardingForm() {
   flowStep.value = props.preOrg ? 'intent' : 'details'
   appDetailsStep.value = 'name'
   selectedIntent.value = null
-  existingApp.value = true
-  existingAppSetup.value = 'manual'
+  existingApp.value = props.preOrg ? true : null
+  existingAppSetup.value = props.preOrg ? 'manual' : null
   appName.value = ''
   manualAppId.value = ''
   hasEditedAppId.value = false
@@ -580,6 +577,7 @@ function resetOnboardingForm() {
   estimatedUsersIndex.value = null
   isStoreImportOpen.value = false
   isStoreIconImportOpen.value = false
+  cancelPendingStoreIconImport()
   createdApp.value = null
   selectedIconFile.value = null
   if (localIconPreview.value.startsWith('blob:'))
@@ -935,6 +933,11 @@ async function importStoreMetadata() {
 }
 
 let storeIconImportRun = 0
+function cancelPendingStoreIconImport() {
+  storeIconImportRun += 1
+  isImportingStoreIcon.value = false
+}
+
 async function importStoreIcon() {
   const requestedUrl = iconStoreUrl.value.trim()
   if (!requestedUrl)
@@ -966,7 +969,7 @@ async function importStoreIcon() {
     storeAppNamePreview.value = typeof data?.name === 'string' && data.name.trim()
       ? data.name.trim()
       : appName.value.trim()
-    selectImportedIcon()
+    selectImportedIcon(false)
     isStoreIconImportOpen.value = false
     trackDetailsEvent('onboarding_store_icon_import_succeeded')
   }
@@ -1087,6 +1090,8 @@ function onSelectIconFormKit(value: unknown) {
       : null
 
   selectedIconFile.value = file
+  if (file)
+    cancelPendingStoreIconImport()
   if (localIconPreview.value.startsWith('blob:'))
     URL.revokeObjectURL(localIconPreview.value)
   localIconPreview.value = file ? URL.createObjectURL(file) : ''
@@ -1104,7 +1109,9 @@ function clearLocalIconSelection() {
   localIconPreview.value = ''
 }
 
-function selectImportedIcon() {
+function selectImportedIcon(cancelPendingImport = true) {
+  if (cancelPendingImport)
+    cancelPendingStoreIconImport()
   clearLocalIconSelection()
   useImportedStoreIcon.value = !!storeIconPreview.value
   if (useImportedStoreIcon.value)
@@ -1113,6 +1120,7 @@ function selectImportedIcon() {
 
 function removeSelectedIcon() {
   const removedIconSource = selectedAppIconSource.value
+  cancelPendingStoreIconImport()
   clearLocalIconSelection()
   useImportedStoreIcon.value = false
   if (removedIconSource !== 'none')
@@ -1187,6 +1195,10 @@ function continueFromAppName() {
     toast.error(t('app-onboarding-toast-name-required'))
     return
   }
+  if (!props.preOrg && existingApp.value === null) {
+    toast.error(t('app-onboarding-toast-existing-required'))
+    return
+  }
 
   completeAndViewAppDetailsStep('app_id')
 }
@@ -1866,8 +1878,8 @@ onMounted(async () => {
     if (!resumed) {
       flowStep.value = 'details'
       appDetailsStep.value = 'name'
-      existingApp.value = true
-      existingAppSetup.value = 'manual'
+      existingApp.value = null
+      existingAppSetup.value = null
     }
 
     void loadApiKey().catch((error) => {
@@ -2088,7 +2100,7 @@ defineExpose({
                 </p>
               </div>
 
-              <div v-if="false" class="grid gap-3 sm:grid-cols-2">
+              <div v-if="!props.preOrg && appDetailsStep === 'name'" class="grid gap-3 sm:grid-cols-2">
                 <button
                   type="button"
                   :aria-pressed="existingApp === true"
@@ -2135,67 +2147,6 @@ defineExpose({
                 </button>
               </div>
 
-              <div v-if="false" class="space-y-5 border-t border-slate-200 pt-6 dark:border-white/15">
-                <div>
-                  <p class="text-sm font-semibold text-slate-950 dark:text-white">
-                    {{ t('app-onboarding-start-question') }}
-                  </p>
-                  <div class="mt-3 grid gap-3 sm:grid-cols-2">
-                    <button
-                      type="button"
-                      :aria-pressed="existingAppSetup === 'import'"
-                      class="flex min-h-24 items-start gap-3 rounded-2xl border p-4 text-left transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-white dark:focus-visible:ring-offset-slate-900"
-                      :class="whiteCardToggleButtonClass(existingAppSetup === 'import')"
-                      @click="existingAppSetup = 'import'"
-                    >
-                      <IconGlobe class="mt-0.5 h-5 w-5 shrink-0" />
-                      <span>
-                        <span class="block text-sm font-semibold">{{ t('app-onboarding-mode-import') }}</span>
-                        <span class="mt-1 block text-sm leading-6 opacity-75">{{ t('app-onboarding-mode-import-helper') }}</span>
-                      </span>
-                    </button>
-                    <button
-                      type="button"
-                      :aria-pressed="existingAppSetup === 'manual'"
-                      class="flex min-h-24 items-start gap-3 rounded-2xl border p-4 text-left transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-white dark:focus-visible:ring-offset-slate-900"
-                      :class="whiteCardToggleButtonClass(existingAppSetup === 'manual')"
-                      @click="existingAppSetup = 'manual'"
-                    >
-                      <IconCode class="mt-0.5 h-5 w-5 shrink-0" />
-                      <span>
-                        <span class="block text-sm font-semibold">{{ t('app-onboarding-mode-manual') }}</span>
-                        <span class="mt-1 block text-sm leading-6 opacity-75">{{ t('app-onboarding-mode-manual-helper') }}</span>
-                      </span>
-                    </button>
-                  </div>
-                </div>
-
-                <template v-if="existingAppSetup === 'import'">
-                  <div>
-                    <label for="app-onboarding-store-url" class="text-sm font-medium text-slate-800 dark:text-slate-200">{{ t('app-onboarding-store-link-label') }}</label>
-                    <div class="mt-2 flex flex-col gap-3 sm:flex-row">
-                      <input
-                        id="app-onboarding-store-url"
-                        v-model="storeUrl"
-                        class="min-h-12 w-full rounded-xl border border-slate-300 bg-white px-4 text-sm text-slate-950 outline-none transition placeholder:text-slate-400 focus:border-primary-500 focus:ring-2 focus:ring-primary-500/10 dark:border-white/20 dark:bg-slate-950/90 dark:text-white dark:placeholder:text-slate-500 dark:focus:border-primary-500 dark:focus:ring-primary-500/30"
-                        :placeholder="t('app-onboarding-store-link-placeholder')"
-                        type="url"
-                      >
-                      <button type="button" class="d-btn min-h-12 shrink-0" :class="whiteCardSecondaryButtonClass()" :disabled="isImportingStore || !storeUrl" @click="importStoreMetadata()">
-                        <IconLoader v-if="isImportingStore" class="h-4 w-4 animate-spin" />
-                        <IconSparkles v-else class="h-4 w-4" />
-                        <span>{{ t('app-onboarding-store-import-button') }}</span>
-                      </button>
-                    </div>
-                    <p class="mt-2 text-sm leading-6 text-slate-500 dark:text-slate-400" aria-live="polite">
-                      {{ hasImportedStoreMetadata
-                        ? t('app-onboarding-store-imported-help')
-                        : t('app-onboarding-store-help') }}
-                    </p>
-                  </div>
-                </template>
-              </div>
-
               <div class="contents">
                 <div v-if="appDetailsStep === 'icon'" class="flex items-center gap-4 rounded-xl border border-slate-200 bg-slate-50 p-4 dark:border-white/15 dark:bg-slate-950/90">
                   <div class="flex h-14 w-14 shrink-0 items-center justify-center overflow-hidden rounded-2xl bg-slate-200 ring-1 ring-slate-300 dark:bg-slate-800 dark:ring-white/10">
@@ -2332,7 +2283,7 @@ defineExpose({
                         :class="canUseStoreImportPreview ? whiteCardSecondaryButtonClass() : whiteCardPrimaryButtonClass()"
                         :disabled="canUseStoreImportPreview"
                         data-test="app-onboarding-use-imported-icon"
-                        @click="selectImportedIcon"
+                        @click="selectImportedIcon()"
                       >
                         <IconCheck v-if="canUseStoreImportPreview" class="h-4 w-4" />
                         {{ canUseStoreImportPreview ? t('app-onboarding-imported-icon-selected') : t('app-onboarding-use-imported-icon') }}
@@ -2409,10 +2360,6 @@ defineExpose({
                   </div>
                 </div>
 
-                <div v-if="false && storeScreenshotPreview" class="overflow-hidden rounded-xl border border-slate-200 dark:border-white/15">
-                  <img :src="storeScreenshotPreview" :alt="t('app-onboarding-store-screenshot-alt')" class="mx-auto aspect-9/19.5 max-h-48 w-auto object-cover object-top">
-                </div>
-
                 <div class="flex flex-col-reverse gap-3 border-t border-slate-200 pt-6 sm:flex-row sm:items-center sm:justify-between dark:border-white/15">
                   <button
                     type="button"
diff --git a/src/utils/userOnboardingProgress.ts b/src/utils/userOnboardingProgress.ts
index c64fd4f4b0..cd70111ffd 100644
--- a/src/utils/userOnboardingProgress.ts
+++ b/src/utils/userOnboardingProgress.ts
@@ -272,6 +272,7 @@ export function shouldPromptOnboardingResume(
 
   return Boolean(
     progress.intent
+    || (progress.details_step !== undefined && progress.details_step !== 'name')
     || progress.app_name
     || progress.existing_app === true
     || progress.existing_app === false
diff --git a/supabase/migrations/20260817183727_user_onboarding_details_step_comment.sql b/supabase/migrations/20260817183727_user_onboarding_details_step_comment.sql
new file mode 100644
index 0000000000..96b7403014
--- /dev/null
+++ b/supabase/migrations/20260817183727_user_onboarding_details_step_comment.sql
@@ -0,0 +1,2 @@
+COMMENT ON COLUMN "public"."users"."onboarding" IS
+  'Persisted create-app onboarding wizard progress for resume and admin drop-off. Keys: status, step, flow, intent, details_step, app_name, app_id, existing_app, existing_app_setup, store_url, imported_store_app_id, org_name, estimated_users_index, onboarding_attempt_id, last_run_id, updated_at, completed_at.';
diff --git a/tests/app-onboarding-file-input.unit.test.ts b/tests/app-onboarding-file-input.unit.test.ts
index 4112e7286c..cbb27c9de4 100644
--- a/tests/app-onboarding-file-input.unit.test.ts
+++ b/tests/app-onboarding-file-input.unit.test.ts
@@ -1,7 +1,7 @@
 // @vitest-environment happy-dom
 
 import { describe, expect, it } from 'vitest'
-import { createSSRApp, h } from 'vue'
+import { createApp, createSSRApp, h, nextTick, ref } from 'vue'
 import { renderToString } from 'vue/server-renderer'
 import AppOnboardingIconInput from '../src/components/dashboard/AppOnboardingIconInput.vue'
 
@@ -52,4 +52,45 @@ describe('app onboarding file input', () => {
     expect(new Set(inputIds).size).toBe(2)
     expect(labelTargets).toEqual(inputIds)
   })
+
+  it('clears the selected filename and native input when the model is reset', async () => {
+    const selectedIcon = ref<unknown>(null)
+    const container = document.createElement('div')
+    document.body.append(container)
+    const app = createApp({
+      setup: () => () => h(AppOnboardingIconInput, {
+        chooseLabel: 'Choose file',
+        emptyLabel: 'No file selected',
+        label: 'App icon',
+        modelValue: selectedIcon.value,
+        'onUpdate:modelValue': (value: unknown) => {
+          selectedIcon.value = value
+        },
+      }),
+    })
+
+    try {
+      app.mount(container)
+      const input = container.querySelector('input') as HTMLInputElement
+      const file = new File(['icon'], 'icon.png', { type: 'image/png' })
+      Object.defineProperty(input, 'files', { configurable: true, value: [file] })
+      Object.defineProperty(input, 'value', { configurable: true, value: 'C:\\fakepath\\icon.png', writable: true })
+      input.dispatchEvent(new Event('change'))
+      await nextTick()
+
+      expect((selectedIcon.value as File).name).toBe('icon.png')
+      expect((selectedIcon.value as File).type).toBe('image/png')
+      expect(container.textContent).toContain('icon.png')
+
+      selectedIcon.value = null
+      await nextTick()
+
+      expect(container.textContent).toContain('No file selected')
+      expect(input.value).toBe('')
+    }
+    finally {
+      app.unmount()
+      container.remove()
+    }
+  })
 })
diff --git a/tests/app-onboarding-v3.unit.test.ts b/tests/app-onboarding-v3.unit.test.ts
index f2bd2a5acf..020290d636 100644
--- a/tests/app-onboarding-v3.unit.test.ts
+++ b/tests/app-onboarding-v3.unit.test.ts
@@ -38,7 +38,6 @@ describe('pre-organization onboarding v3', () => {
     expect(onboardingSource).toContain(':aria-expanded="isStoreImportOpen"')
     expect(onboardingSource).toContain('v-if="isStoreImportOpen" id="app-onboarding-store-import-panel"')
     expect(onboardingSource).toContain("trackDetailsEvent(isStoreImportOpen.value ? 'onboarding_store_import_shown' : 'onboarding_store_import_hidden')")
-    expect(onboardingSource).toContain('// Store publication is unrelated to whether the user already has a mobile project.')
     expect(onboardingSource).toContain('existingApp.value = true')
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_import_submitted'")
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_import_succeeded'")
@@ -65,7 +64,8 @@ describe('pre-organization onboarding v3', () => {
     )
     expect(iconImport).toContain("invokeCapgoApi('app/store-metadata'")
     expect(iconImport).toContain('storeIconPreview.value = importedIcon')
-    expect(iconImport).toContain('selectImportedIcon()')
+    expect(iconImport).toContain('selectImportedIcon(false)')
+    expect(onboardingSource).toContain('function cancelPendingStoreIconImport()')
     expect(iconImport).not.toContain('appName.value =')
     expect(iconImport).not.toContain('manualAppId.value =')
     expect(iconImport).not.toContain('importedStoreAppId.value =')
@@ -79,11 +79,23 @@ describe('pre-organization onboarding v3', () => {
     expect(onboardingSource).toContain('class="mb-6 mt-5 overflow-hidden rounded-xl')
     const iconImportPanel = onboardingSource.slice(
       onboardingSource.indexOf('id="app-onboarding-icon-store-import-panel"'),
-      onboardingSource.indexOf('<div v-if="false && storeScreenshotPreview"'),
+      onboardingSource.indexOf('<div class="flex flex-col-reverse gap-3 border-t'),
     )
     expect(iconImportPanel).toContain('<div class="space-y-3">')
     expect(iconImportPanel).toContain('class="d-btn min-h-11 w-full sm:w-auto"')
     expect(iconImportPanel).not.toContain('sm:flex-row')
+    expect(onboardingSource).not.toContain('v-if="false"')
+    expect(onboardingSource).not.toContain('v-if="false && storeScreenshotPreview"')
+  })
+
+  it.concurrent('keeps the existing-app choice reachable for existing-organization creation', () => {
+    expect(onboardingSource).toContain('v-if="!props.preOrg && appDetailsStep === \'name\'" class="grid gap-3 sm:grid-cols-2"')
+    expect(onboardingSource).toContain('existingApp.value = props.preOrg ? true : null')
+    expect(onboardingSource).toContain("toast.error(t('app-onboarding-toast-existing-required'))")
+  })
+
+  it.concurrent('does not restore a skipped generated App ID as a manual choice', () => {
+    expect(onboardingSource).toContain("appId: selectedAppIdSource.value === 'generated' ? '' : generatedAppId.value")
   })
 
   it.concurrent('tracks every app-details page as a standard onboarding step', () => {
diff --git a/tests/user-onboarding-progress.unit.test.ts b/tests/user-onboarding-progress.unit.test.ts
index 7de4a100e5..7a7901f575 100644
--- a/tests/user-onboarding-progress.unit.test.ts
+++ b/tests/user-onboarding-progress.unit.test.ts
@@ -112,6 +112,13 @@ describe('user onboarding progress', () => {
       intent: 'ota',
       updatedAt: '2026-08-15T00:00:00.000Z',
     }), 'pre_org')).toBe(true)
+    expect(shouldPromptOnboardingResume(buildUserOnboardingProgress({
+      status: 'in_progress',
+      step: 'details',
+      flow: 'existing_org',
+      detailsStep: 'app_id',
+      updatedAt: '2026-08-15T00:00:00.000Z',
+    }), 'existing_org')).toBe(true)
     expect(shouldPromptOnboardingResume(buildUserOnboardingProgress({
       status: 'in_progress',
       step: 'organization',

From bca27f243e1b4a38e3fa23af99cb7bd515b30ee9 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 17 Aug 2026 20:44:09 +0200
Subject: [PATCH 04/10] test(onboarding): satisfy monorepo typecheck

---
 tests/app-onboarding-file-input.unit.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/app-onboarding-file-input.unit.test.ts b/tests/app-onboarding-file-input.unit.test.ts
index cbb27c9de4..857918274b 100644
--- a/tests/app-onboarding-file-input.unit.test.ts
+++ b/tests/app-onboarding-file-input.unit.test.ts
@@ -56,7 +56,7 @@ describe('app onboarding file input', () => {
   it('clears the selected filename and native input when the model is reset', async () => {
     const selectedIcon = ref<unknown>(null)
     const container = document.createElement('div')
-    document.body.append(container)
+    document.body.appendChild(container)
     const app = createApp({
       setup: () => () => h(AppOnboardingIconInput, {
         chooseLabel: 'Choose file',

From 26bea0543302864458b8e3e0a07440be06d5d07e Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 17 Aug 2026 20:52:28 +0200
Subject: [PATCH 05/10] fix(onboarding): finalize tracked app steps

---
 .../dashboard/AppOnboardingFlow.vue           | 21 +++++++------------
 src/utils/onboardingProgressAnalytics.ts      |  2 +-
 tests/app-onboarding-v3.unit.test.ts          |  4 ++++
 ...onboarding-progress-analytics.unit.test.ts |  6 +++---
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/components/dashboard/AppOnboardingFlow.vue b/src/components/dashboard/AppOnboardingFlow.vue
index e17e61ffe7..fb787cd4a1 100644
--- a/src/components/dashboard/AppOnboardingFlow.vue
+++ b/src/components/dashboard/AppOnboardingFlow.vue
@@ -152,7 +152,6 @@ const selectedIconFile = ref<File | null>(null)
 const localIconPreview = ref('')
 const storeIconPreview = ref('')
 const storeAppNamePreview = ref('')
-const storeScreenshotPreview = ref('')
 const useImportedStoreIcon = ref(false)
 const existingApp = ref<boolean | null>(null)
 const existingAppSetup = ref<'import' | 'manual' | null>(null)
@@ -374,7 +373,7 @@ const onboardingProgressPersistence = createOnboardingProgressPersistence({
 
 function trackDetailsEvent(name: OnboardingDetailsEvent, details: OnboardingDetailsEventProperties = {}) {
   if (props.preOrg)
-    progressTracker?.trackDetailsEvent(name, details, analyticsStepFor('details'))
+    progressTracker?.trackDetailsEvent(name, analyticsStepFor('details'), details)
 }
 
 function trackOrganizationEvent(
@@ -577,7 +576,6 @@ function resetOnboardingForm() {
   estimatedUsersIndex.value = null
   isStoreImportOpen.value = false
   isStoreIconImportOpen.value = false
-  cancelPendingStoreIconImport()
   createdApp.value = null
   selectedIconFile.value = null
   if (localIconPreview.value.startsWith('blob:'))
@@ -757,12 +755,13 @@ function getStoreUrls(url: string) {
 }
 
 let storeImportRun = 0
+let storeIconImportRun = 0
 function resetStoreImportState() {
   storeImportRun += 1
+  cancelPendingStoreIconImport()
   storeUrl.value = ''
   storeIconPreview.value = ''
   storeAppNamePreview.value = ''
-  storeScreenshotPreview.value = ''
   useImportedStoreIcon.value = false
   importedStoreAppId.value = ''
   isImportingStore.value = false
@@ -856,7 +855,6 @@ async function loadResumeApp() {
   const iconLoadRun = ++resumeIconLoadRun
   localIconPreview.value = getImmediateImageUrl(data.icon_url) || ''
   void loadResumeIconPreview(data.icon_url, data.app_id, iconLoadRun)
-  storeScreenshotPreview.value = ''
   if (resumeStep.value === 'setup') {
     flowStep.value = 'setup'
     hydrateIntentFromCurrentOrg()
@@ -909,8 +907,6 @@ async function importStoreMetadata() {
       useImportedStoreIcon.value = false
     }
 
-    storeScreenshotPreview.value = typeof data?.screenshot_url === 'string' ? data.screenshot_url.trim() : ''
-
     importedStoreAppId.value = typeof data?.app_id === 'string' ? data.app_id.trim() : ''
 
     if (props.preOrg)
@@ -932,7 +928,6 @@ async function importStoreMetadata() {
   }
 }
 
-let storeIconImportRun = 0
 function cancelPendingStoreIconImport() {
   storeIconImportRun += 1
   isImportingStoreIcon.value = false
@@ -1253,6 +1248,7 @@ async function uploadIcon(appId: string, iconSourceUrl?: string) {
     return
 
   let fileToUpload = selectedIconFile.value
+  const iconSource = selectedIconFile.value || (iconSourceUrl && iconSourceUrl === localIconPreview.value) ? 'file' : 'store'
 
   if (!fileToUpload && iconSourceUrl) {
     try {
@@ -1286,12 +1282,10 @@ async function uploadIcon(appId: string, iconSourceUrl?: string) {
 
   if (!fileToUpload) {
     if (iconSourceUrl)
-      trackDetailsEvent('onboarding_app_icon_upload_failed', { icon_source: 'store' })
+      trackDetailsEvent('onboarding_app_icon_upload_failed', { icon_source: iconSource })
     return
   }
 
-  const iconSource = selectedIconFile.value ? 'file' : 'store'
-
   const iconPath = `org/${currentOrg.value.gid}/${appId}/icon`
   const { error: uploadError } = await supabase.storage
     .from('images')
@@ -1355,8 +1349,6 @@ function restoreDraftState() {
     storeIconPreview.value = draft.storeIconDataUrl
     useImportedStoreIcon.value = !draft.iconDataUrl
   }
-  if (draft.storeScreenshotUrl)
-    storeScreenshotPreview.value = draft.storeScreenshotUrl
   if (draft.iconDataUrl)
     localIconPreview.value = draft.iconDataUrl
   return true
@@ -1625,8 +1617,9 @@ async function createAppRecord(options?: { nextStep?: StandardFlowStep | PreOrgF
       appIdSuggestions.value = []
     }
 
+    const restoredLocalIconSource = localIconPreview.value.startsWith('data:image/') ? localIconPreview.value : ''
     const importedIconSource = canUseStoreImportPreview.value ? storeIconPreview.value : ''
-    await uploadIcon(appId, importedIconSource)
+    await uploadIcon(appId, restoredLocalIconSource || importedIconSource)
     const { data: refreshed } = await supabase
       .from('apps')
       .select()
diff --git a/src/utils/onboardingProgressAnalytics.ts b/src/utils/onboardingProgressAnalytics.ts
index c02d9523eb..693397664f 100644
--- a/src/utils/onboardingProgressAnalytics.ts
+++ b/src/utils/onboardingProgressAnalytics.ts
@@ -300,8 +300,8 @@ export function createOnboardingProgressTracker(options: CreateOnboardingProgres
 
   function trackDetailsEvent(
     name: OnboardingDetailsEvent,
+    step: OnboardingAnalyticsStep,
     details: OnboardingDetailsEventProperties = {},
-    step: OnboardingAnalyticsStep = 'details',
   ) {
     trackEvent(name, step, details)
   }
diff --git a/tests/app-onboarding-v3.unit.test.ts b/tests/app-onboarding-v3.unit.test.ts
index 020290d636..4c9aeb7961 100644
--- a/tests/app-onboarding-v3.unit.test.ts
+++ b/tests/app-onboarding-v3.unit.test.ts
@@ -123,6 +123,8 @@ describe('pre-organization onboarding v3', () => {
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_icon_import_submitted'")
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_icon_import_succeeded'")
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_icon_import_failed'")
+    const resetStoreImportState = onboardingSource.slice(onboardingSource.indexOf('function resetStoreImportState()'), onboardingSource.indexOf('let resumeIconLoadRun'))
+    expect(resetStoreImportState).toContain('cancelPendingStoreIconImport()')
   })
 
   it.concurrent('continues to organization creation after the pre-org icon step', () => {
@@ -155,6 +157,8 @@ describe('pre-organization onboarding v3', () => {
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_app_icon_uploaded'")
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_app_icon_upload_failed'")
     expect(onboardingSource).toContain("parsedIconUrl.protocol === 'data:' && iconSourceUrl.startsWith('data:image/')")
+    expect(onboardingSource).toContain("const restoredLocalIconSource = localIconPreview.value.startsWith('data:image/')")
+    expect(onboardingSource).toContain('await uploadIcon(appId, restoredLocalIconSource || importedIconSource)')
   })
 
   it.concurrent('opens App ID guidance and tracks only the open action', () => {
diff --git a/tests/onboarding-progress-analytics.unit.test.ts b/tests/onboarding-progress-analytics.unit.test.ts
index 5e17643147..9273dd0a9e 100644
--- a/tests/onboarding-progress-analytics.unit.test.ts
+++ b/tests/onboarding-progress-analytics.unit.test.ts
@@ -271,7 +271,7 @@ describe('onboarding progress analytics', () => {
       supaHost: 'https://supabase.capgo.test',
     })
 
-    tracker.trackDetailsEvent('onboarding_app_name_entered', { field_length: 11 })
+    tracker.trackDetailsEvent('onboarding_app_name_entered', 'details', { field_length: 11 })
 
     expect(capture).toHaveBeenCalledWith(
       'onboarding_app_name_entered',
@@ -301,7 +301,7 @@ describe('onboarding progress analytics', () => {
 
     tracker.viewStep('app_name')
     capture.mockClear()
-    tracker.trackDetailsEvent('onboarding_app_name_entered', { field_length: 11 }, 'app_name')
+    tracker.trackDetailsEvent('onboarding_app_name_entered', 'app_name', { field_length: 11 })
 
     expect(capture).toHaveBeenCalledWith(
       'onboarding_app_name_entered',
@@ -326,7 +326,7 @@ describe('onboarding progress analytics', () => {
       supaHost: 'https://supabase.capgo.test',
     })
 
-    tracker.trackDetailsEvent('onboarding_app_creation_succeeded', {
+    tracker.trackDetailsEvent('onboarding_app_creation_succeeded', 'details', {
       app_id_source: 'generated',
       has_icon: true,
       icon_source: 'store',

From 2b85130bf34ff5df51af782d4cc3be876591901e Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 17 Aug 2026 21:08:23 +0200
Subject: [PATCH 06/10] test(onboarding): follow staged app creation flow

---
 playwright/e2e/register.spec.ts | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/playwright/e2e/register.spec.ts b/playwright/e2e/register.spec.ts
index b8ccad89b9..f40e0a7ba2 100644
--- a/playwright/e2e/register.spec.ts
+++ b/playwright/e2e/register.spec.ts
@@ -18,6 +18,23 @@ async function expectProtectedRouteRedirect(page: Page, targetPath: string, expe
   }
 }
 
+async function continueFromAppNameToOrganization(page: Page) {
+  await page.click('[data-test="app-onboarding-continue"]')
+  await expect(page.locator('#app-onboarding-app-id')).toBeVisible()
+  await page.click('[data-test="app-onboarding-skip-app-id"]')
+  await expect(page.locator('[data-test="app-onboarding-toggle-icon-store-import"]')).toBeVisible()
+  await page.click('[data-test="app-onboarding-continue"]')
+}
+
+async function returnFromOrganizationToAppName(page: Page) {
+  await page.getByRole('button', { name: 'Back', exact: true }).click()
+  await expect(page.locator('[data-test="app-onboarding-toggle-icon-store-import"]')).toBeVisible()
+  await page.getByRole('button', { name: 'Back', exact: true }).click()
+  await expect(page.locator('#app-onboarding-app-id')).toBeVisible()
+  await page.getByRole('button', { name: 'Back', exact: true }).click()
+  await expect(page.locator('[data-test="app-onboarding-name"]')).toBeVisible()
+}
+
 test.describe('Registration', () => {
   test.beforeEach(async ({ page }) => {
     await page.goto('/register/')
@@ -45,22 +62,22 @@ test.describe('Registration', () => {
     await expect(page.locator('[data-test="app-onboarding-existing-yes"]')).toHaveCount(0)
     await expect(page.locator('[data-test="app-onboarding-existing-no"]')).toHaveCount(0)
     await expect(page.locator('[data-test="app-onboarding-name"]')).toBeVisible()
-    await expect(page.locator('#app-onboarding-app-id')).toBeVisible()
+    await expect(page.locator('#app-onboarding-app-id')).toHaveCount(0)
     await page.fill('[data-test="app-onboarding-name"]', appName)
-    await page.click('[data-test="app-onboarding-continue"]')
+    await continueFromAppNameToOrganization(page)
 
     await expectProtectedRouteRedirect(page, '/apps', /\/onboarding\/app/, '[data-test="onboarding-logout"]')
 
     await expect(page.locator('[data-test="onboarding-org-name"]')).toHaveValue(appName)
     await page.locator('[data-test="onboarding-estimated-users-option"]').nth(1).click()
-    await page.getByRole('button', { name: 'Back', exact: true }).click()
+    await returnFromOrganizationToAppName(page)
     await page.fill('[data-test="app-onboarding-name"]', editedAppName)
-    await page.click('[data-test="app-onboarding-continue"]')
+    await continueFromAppNameToOrganization(page)
     await expect(page.locator('[data-test="onboarding-org-name"]')).toHaveValue(editedAppName)
     await page.fill('[data-test="onboarding-org-name"]', organizationName)
-    await page.getByRole('button', { name: 'Back', exact: true }).click()
+    await returnFromOrganizationToAppName(page)
     await page.fill('[data-test="app-onboarding-name"]', finalAppName)
-    await page.click('[data-test="app-onboarding-continue"]')
+    await continueFromAppNameToOrganization(page)
     await expect(page.locator('[data-test="onboarding-org-name"]')).toHaveValue(organizationName)
     await expect(page.locator('[data-test="onboarding-create-org"]')).toBeEnabled()
     await page.click('[data-test="onboarding-create-org"]')
@@ -91,6 +108,10 @@ test.describe('Registration', () => {
     await page.click('[data-test="onboarding-intent-ota"]')
     await page.click('[data-test="app-onboarding-continue-intent"]')
     await page.fill('[data-test="app-onboarding-name"]', appName)
+    await page.click('[data-test="app-onboarding-continue"]')
+    await expect(page.locator('#app-onboarding-app-id')).toBeVisible()
+    await page.click('[data-test="app-onboarding-skip-app-id"]')
+    await expect(page.locator('[data-test="app-onboarding-toggle-icon-store-import"]')).toBeVisible()
     await Promise.all([
       page.waitForResponse((response) => {
         if (!response.url().includes('/rest/v1/users') || response.request().method() !== 'PATCH' || !response.ok())

From 9a8c032a7c9c199a329b6f96db158619d50f92ce Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 18 Aug 2026 09:45:15 +0200
Subject: [PATCH 07/10] test(onboarding): share staged flow navigation

---
 playwright/e2e/register.spec.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/playwright/e2e/register.spec.ts b/playwright/e2e/register.spec.ts
index f40e0a7ba2..a42032ea11 100644
--- a/playwright/e2e/register.spec.ts
+++ b/playwright/e2e/register.spec.ts
@@ -18,11 +18,15 @@ async function expectProtectedRouteRedirect(page: Page, targetPath: string, expe
   }
 }
 
-async function continueFromAppNameToOrganization(page: Page) {
+async function continueFromAppNameToIcon(page: Page) {
   await page.click('[data-test="app-onboarding-continue"]')
   await expect(page.locator('#app-onboarding-app-id')).toBeVisible()
   await page.click('[data-test="app-onboarding-skip-app-id"]')
   await expect(page.locator('[data-test="app-onboarding-toggle-icon-store-import"]')).toBeVisible()
+}
+
+async function continueFromAppNameToOrganization(page: Page) {
+  await continueFromAppNameToIcon(page)
   await page.click('[data-test="app-onboarding-continue"]')
 }
 
@@ -108,10 +112,7 @@ test.describe('Registration', () => {
     await page.click('[data-test="onboarding-intent-ota"]')
     await page.click('[data-test="app-onboarding-continue-intent"]')
     await page.fill('[data-test="app-onboarding-name"]', appName)
-    await page.click('[data-test="app-onboarding-continue"]')
-    await expect(page.locator('#app-onboarding-app-id')).toBeVisible()
-    await page.click('[data-test="app-onboarding-skip-app-id"]')
-    await expect(page.locator('[data-test="app-onboarding-toggle-icon-store-import"]')).toBeVisible()
+    await continueFromAppNameToIcon(page)
     await Promise.all([
       page.waitForResponse((response) => {
         if (!response.url().includes('/rest/v1/users') || response.request().method() !== 'PATCH' || !response.ok())

From 89b2abc6ea03e5e33b4faf34f94d07a53568ede5 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 18 Aug 2026 10:30:12 +0200
Subject: [PATCH 08/10] fix(onboarding): preserve typed event steps

---
 .../dashboard/AppOnboardingFlow.vue           | 13 +++---
 src/utils/onboardingProgressAnalytics.ts      | 25 +++++++++---
 ...7_user_onboarding_details_step_comment.sql |  8 +++-
 tests/app-onboarding-v3.unit.test.ts          |  8 ++--
 ...rding-details-field-debouncer.unit.test.ts | 40 +++++++++++++------
 5 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/src/components/dashboard/AppOnboardingFlow.vue b/src/components/dashboard/AppOnboardingFlow.vue
index fb787cd4a1..aa03dcc305 100644
--- a/src/components/dashboard/AppOnboardingFlow.vue
+++ b/src/components/dashboard/AppOnboardingFlow.vue
@@ -383,7 +383,10 @@ function trackOrganizationEvent(
   progressTracker?.trackStepEvent(name, 'organization', details)
 }
 
-const detailsFieldTracker = createOnboardingDetailsFieldDebouncer(trackDetailsEvent)
+const detailsFieldTracker = createOnboardingDetailsFieldDebouncer((name, step, details) => {
+  if (props.preOrg)
+    progressTracker?.trackDetailsEvent(name, step, details)
+})
 
 function analyticsStepFor(flow: OnboardingFlowStep, detailsStep = appDetailsStep.value): OnboardingAnalyticsStep {
   if (flow === 'details')
@@ -1135,7 +1138,7 @@ function onIconPickerClosedWithoutSelection() {
 }
 
 function onAppNameInput(event: Event) {
-  detailsFieldTracker.schedule('onboarding_app_name_entered', 'app_name', (event.target as HTMLInputElement).value)
+  detailsFieldTracker.schedule('onboarding_app_name_entered', 'app_name', 'app_name', (event.target as HTMLInputElement).value)
 }
 
 function onAppIdInput(event: Event) {
@@ -1143,15 +1146,15 @@ function onAppIdInput(event: Event) {
   manualAppId.value = (event.target as HTMLInputElement).value
   appIdFeedback.value = ''
   appIdSuggestions.value = []
-  detailsFieldTracker.schedule('onboarding_app_id_entered', 'app_id', manualAppId.value)
+  detailsFieldTracker.schedule('onboarding_app_id_entered', 'app_id', 'app_id', manualAppId.value)
 }
 
 function onStoreUrlInput(event: Event) {
-  detailsFieldTracker.schedule('onboarding_store_url_entered', 'store_url', (event.target as HTMLInputElement).value)
+  detailsFieldTracker.schedule('onboarding_store_url_entered', 'store_url', 'app_id', (event.target as HTMLInputElement).value)
 }
 
 function onIconStoreUrlInput(event: Event) {
-  detailsFieldTracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url', (event.target as HTMLInputElement).value)
+  detailsFieldTracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url', 'app_icon', (event.target as HTMLInputElement).value)
 }
 
 function openAppIdHelp() {
diff --git a/src/utils/onboardingProgressAnalytics.ts b/src/utils/onboardingProgressAnalytics.ts
index 693397664f..4b51d1b8fd 100644
--- a/src/utils/onboardingProgressAnalytics.ts
+++ b/src/utils/onboardingProgressAnalytics.ts
@@ -95,13 +95,26 @@ export interface OnboardingCopyEventProperties {
 export type OnboardingDetailsField = 'app_id' | 'app_name' | 'icon_store_url' | 'store_url'
 
 export function createOnboardingDetailsFieldDebouncer(
-  emit: (name: OnboardingDetailsEvent, properties: OnboardingDetailsEventProperties) => void,
+  emit: (
+    name: OnboardingDetailsEvent,
+    step: OnboardingAnalyticsStep,
+    properties: OnboardingDetailsEventProperties,
+  ) => void,
   delayMs = 1_000,
 ) {
   const timers = new Map<OnboardingDetailsField, ReturnType<typeof setTimeout>>()
-  const pending = new Map<OnboardingDetailsField, { name: OnboardingDetailsEvent, properties: OnboardingDetailsEventProperties }>()
+  const pending = new Map<OnboardingDetailsField, {
+    name: OnboardingDetailsEvent
+    properties: OnboardingDetailsEventProperties
+    step: OnboardingAnalyticsStep
+  }>()
 
-  function schedule(name: OnboardingDetailsEvent, field: OnboardingDetailsField, value: string) {
+  function schedule(
+    name: OnboardingDetailsEvent,
+    field: OnboardingDetailsField,
+    step: OnboardingAnalyticsStep,
+    value: string,
+  ) {
     const activeTimer = timers.get(field)
     if (activeTimer)
       clearTimeout(activeTimer)
@@ -113,10 +126,10 @@ export function createOnboardingDetailsFieldDebouncer(
       return
     }
 
-    const event = { name, properties: { field_length: normalizedValue.length } }
+    const event = { name, step, properties: { field_length: normalizedValue.length } }
     pending.set(field, event)
     timers.set(field, setTimeout(() => {
-      emit(event.name, event.properties)
+      emit(event.name, event.step, event.properties)
       timers.delete(field)
       pending.delete(field)
     }, delayMs))
@@ -126,7 +139,7 @@ export function createOnboardingDetailsFieldDebouncer(
     for (const timer of timers.values())
       clearTimeout(timer)
     for (const event of pending.values())
-      emit(event.name, event.properties)
+      emit(event.name, event.step, event.properties)
     timers.clear()
     pending.clear()
   }
diff --git a/supabase/migrations/20260817183727_user_onboarding_details_step_comment.sql b/supabase/migrations/20260817183727_user_onboarding_details_step_comment.sql
index 96b7403014..0304d65e9b 100644
--- a/supabase/migrations/20260817183727_user_onboarding_details_step_comment.sql
+++ b/supabase/migrations/20260817183727_user_onboarding_details_step_comment.sql
@@ -1,2 +1,6 @@
-COMMENT ON COLUMN "public"."users"."onboarding" IS
-  'Persisted create-app onboarding wizard progress for resume and admin drop-off. Keys: status, step, flow, intent, details_step, app_name, app_id, existing_app, existing_app_setup, store_url, imported_store_app_id, org_name, estimated_users_index, onboarding_attempt_id, last_run_id, updated_at, completed_at.';
+COMMENT ON COLUMN public.users.onboarding IS
+'Persisted create-app onboarding wizard progress for resume and admin '
+'drop-off. Keys: status, step, flow, intent, details_step, app_name, app_id, '
+'existing_app, existing_app_setup, store_url, imported_store_app_id, '
+'org_name, estimated_users_index, onboarding_attempt_id, last_run_id, '
+'updated_at, completed_at.';
diff --git a/tests/app-onboarding-v3.unit.test.ts b/tests/app-onboarding-v3.unit.test.ts
index 4c9aeb7961..18f49751a8 100644
--- a/tests/app-onboarding-v3.unit.test.ts
+++ b/tests/app-onboarding-v3.unit.test.ts
@@ -132,10 +132,10 @@ describe('pre-organization onboarding v3', () => {
   })
 
   it.concurrent('does not send raw onboarding field values to analytics', () => {
-    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_app_name_entered', 'app_name'")
-    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_app_id_entered', 'app_id'")
-    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_store_url_entered', 'store_url'")
-    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url'")
+    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_app_name_entered', 'app_name', 'app_name'")
+    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_app_id_entered', 'app_id', 'app_id'")
+    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_store_url_entered', 'store_url', 'app_id'")
+    expect(onboardingSource).toContain("detailsFieldTracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url', 'app_icon'")
     expect(onboardingSource).toContain('@input="onIconStoreUrlInput"')
     expect(onboardingSource).not.toContain('{ app_name:')
     expect(onboardingSource).not.toContain('{ store_url:')
diff --git a/tests/onboarding-details-field-debouncer.unit.test.ts b/tests/onboarding-details-field-debouncer.unit.test.ts
index ddc9948957..a173326847 100644
--- a/tests/onboarding-details-field-debouncer.unit.test.ts
+++ b/tests/onboarding-details-field-debouncer.unit.test.ts
@@ -11,15 +11,15 @@ describe('onboarding details field analytics debounce', () => {
     const emit = vi.fn()
     const tracker = createOnboardingDetailsFieldDebouncer(emit)
 
-    tracker.schedule('onboarding_app_name_entered', 'app_name', 'Example')
+    tracker.schedule('onboarding_app_name_entered', 'app_name', 'app_name', 'Example')
     vi.advanceTimersByTime(750)
-    tracker.schedule('onboarding_app_name_entered', 'app_name', '  Example App  ')
+    tracker.schedule('onboarding_app_name_entered', 'app_name', 'app_name', '  Example App  ')
     vi.advanceTimersByTime(999)
     expect(emit).not.toHaveBeenCalled()
 
     vi.advanceTimersByTime(1)
     expect(emit).toHaveBeenCalledOnce()
-    expect(emit).toHaveBeenCalledWith('onboarding_app_name_entered', { field_length: 11 })
+    expect(emit).toHaveBeenCalledWith('onboarding_app_name_entered', 'app_name', { field_length: 11 })
   })
 
   it('tracks fields independently, cancels empty values, and flushes pending values on dispose', () => {
@@ -27,23 +27,37 @@ describe('onboarding details field analytics debounce', () => {
     const emit = vi.fn()
     const tracker = createOnboardingDetailsFieldDebouncer(emit)
 
-    tracker.schedule('onboarding_app_name_entered', 'app_name', 'Discard me')
-    tracker.schedule('onboarding_app_name_entered', 'app_name', '   ')
-    tracker.schedule('onboarding_app_id_entered', 'app_id', 'com.example.app')
-    tracker.schedule('onboarding_store_url_entered', 'store_url', 'https://apps.apple.com/example')
+    tracker.schedule('onboarding_app_name_entered', 'app_name', 'app_name', 'Discard me')
+    tracker.schedule('onboarding_app_name_entered', 'app_name', 'app_name', '   ')
+    tracker.schedule('onboarding_app_id_entered', 'app_id', 'app_id', 'com.example.app')
+    tracker.schedule('onboarding_store_url_entered', 'store_url', 'app_id', 'https://apps.apple.com/example')
     const iconStoreUrl = 'https://play.google.com/example'
-    tracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url', iconStoreUrl)
+    tracker.schedule('onboarding_store_icon_url_entered', 'icon_store_url', 'app_icon', iconStoreUrl)
     vi.advanceTimersByTime(1_000)
 
     expect(emit).toHaveBeenCalledTimes(3)
-    expect(emit).toHaveBeenCalledWith('onboarding_app_id_entered', { field_length: 15 })
-    expect(emit).toHaveBeenCalledWith('onboarding_store_url_entered', { field_length: 30 })
-    expect(emit).toHaveBeenCalledWith('onboarding_store_icon_url_entered', { field_length: iconStoreUrl.length })
+    expect(emit).toHaveBeenCalledWith('onboarding_app_id_entered', 'app_id', { field_length: 15 })
+    expect(emit).toHaveBeenCalledWith('onboarding_store_url_entered', 'app_id', { field_length: 30 })
+    expect(emit).toHaveBeenCalledWith('onboarding_store_icon_url_entered', 'app_icon', { field_length: iconStoreUrl.length })
 
-    tracker.schedule('onboarding_app_name_entered', 'app_name', 'Never emitted')
+    tracker.schedule('onboarding_app_name_entered', 'app_name', 'app_name', 'Never emitted')
     tracker.dispose()
     vi.runAllTimers()
     expect(emit).toHaveBeenCalledTimes(4)
-    expect(emit).toHaveBeenLastCalledWith('onboarding_app_name_entered', { field_length: 13 })
+    expect(emit).toHaveBeenLastCalledWith('onboarding_app_name_entered', 'app_name', { field_length: 13 })
+  })
+
+  it('keeps the page step captured before a user continues during the debounce', () => {
+    vi.useFakeTimers()
+    const emit = vi.fn()
+    const tracker = createOnboardingDetailsFieldDebouncer(emit)
+    let currentPage: 'app_id' | 'app_name' = 'app_name'
+
+    tracker.schedule('onboarding_app_name_entered', 'app_name', currentPage, 'Example App')
+    currentPage = 'app_id'
+    vi.advanceTimersByTime(1_000)
+
+    expect(currentPage).toBe('app_id')
+    expect(emit).toHaveBeenCalledWith('onboarding_app_name_entered', 'app_name', { field_length: 11 })
   })
 })

From 8a6ea97864285eb8818ff3e7edc4ce2c834af932 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 18 Aug 2026 12:56:11 +0200
Subject: [PATCH 09/10] fix(onboarding): track restored draft icons

---
 .../dashboard/AppOnboardingFlow.vue           | 17 +++++++++------
 src/utils/onboardingProgressAnalytics.ts      | 12 +++++++++++
 ...boarding-progress-integration.unit.test.ts |  8 ++++++-
 tests/app-onboarding-v3.unit.test.ts          | 10 +++++++++
 ...onboarding-progress-analytics.unit.test.ts | 21 +++++++++++++++++++
 5 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/components/dashboard/AppOnboardingFlow.vue b/src/components/dashboard/AppOnboardingFlow.vue
index aa03dcc305..41f2601618 100644
--- a/src/components/dashboard/AppOnboardingFlow.vue
+++ b/src/components/dashboard/AppOnboardingFlow.vue
@@ -67,7 +67,12 @@ import {
   loadOnboardingAppDraft,
 } from '~/utils/onboardingAppDraft'
 import { onboardingPrimaryButtonClass, onboardingSecondaryButtonClass } from '~/utils/onboardingButtonClasses'
-import { createOnboardingDetailsFieldDebouncer, createOnboardingProgressTracker, createOnboardingTelemetryIdentity } from '~/utils/onboardingProgressAnalytics'
+import {
+  createOnboardingDetailsFieldDebouncer,
+  createOnboardingProgressTracker,
+  createOnboardingTelemetryIdentity,
+  resolveOnboardingAppIconSource,
+} from '~/utils/onboardingProgressAnalytics'
 import { createOnboardingProgressPersistence, shouldInitializeOnboardingProgressTracking } from '~/utils/onboardingProgressPersistence'
 import { allowOnboardingDashboardExploration, ONBOARDING_DASHBOARD_EXPLORED_EVENT } from '~/utils/onboardingRedirect'
 import { slugifyOnboardingSegment } from '~/utils/onboardingSlug'
@@ -298,11 +303,11 @@ const selectedAppIdSource = computed<NonNullable<OnboardingDetailsEventPropertie
   return 'generated'
 })
 const selectedAppIconSource = computed<NonNullable<OnboardingDetailsEventProperties['icon_source']>>(() => {
-  if (selectedIconFile.value)
-    return 'file'
-  if (canUseStoreImportPreview.value)
-    return 'store'
-  return 'none'
+  return resolveOnboardingAppIconSource({
+    canUseStoreImportPreview: canUseStoreImportPreview.value,
+    hasSelectedIconFile: Boolean(selectedIconFile.value),
+    localIconPreview: localIconPreview.value,
+  })
 })
 function createAiHelpPrompt() {
   const resolvedAppId = createdApp.value?.app_id || generatedAppId.value || '[APP_ID]'
diff --git a/src/utils/onboardingProgressAnalytics.ts b/src/utils/onboardingProgressAnalytics.ts
index 4b51d1b8fd..5461d8a3f3 100644
--- a/src/utils/onboardingProgressAnalytics.ts
+++ b/src/utils/onboardingProgressAnalytics.ts
@@ -80,6 +80,18 @@ export interface OnboardingDetailsEventProperties {
   used_fallback?: boolean
 }
 
+export function resolveOnboardingAppIconSource(options: {
+  canUseStoreImportPreview: boolean
+  hasSelectedIconFile: boolean
+  localIconPreview: string
+}): NonNullable<OnboardingDetailsEventProperties['icon_source']> {
+  if (options.hasSelectedIconFile || options.localIconPreview.startsWith('data:image/'))
+    return 'file'
+  if (options.canUseStoreImportPreview)
+    return 'store'
+  return 'none'
+}
+
 export interface OnboardingInteractionProperties {
   invitation_count?: number
 }
diff --git a/tests/app-onboarding-progress-integration.unit.test.ts b/tests/app-onboarding-progress-integration.unit.test.ts
index 68b3a837b8..ad8ea7244c 100644
--- a/tests/app-onboarding-progress-integration.unit.test.ts
+++ b/tests/app-onboarding-progress-integration.unit.test.ts
@@ -25,7 +25,13 @@ function expectSourceOrder(source: string, markers: string[]) {
 
 describe('app onboarding progress analytics integration', () => {
   it.concurrent('initializes tracking once the real initial or resumed step is resolved', () => {
-    expect(onboardingSource).toContain(`import { createOnboardingDetailsFieldDebouncer, createOnboardingProgressTracker, createOnboardingTelemetryIdentity } from '~/utils/onboardingProgressAnalytics'`)
+    const analyticsImport = sourceBetween(
+      'import {\n  createOnboardingDetailsFieldDebouncer,',
+      'import { createOnboardingProgressPersistence',
+    )
+    expect(analyticsImport).toContain('createOnboardingProgressTracker,')
+    expect(analyticsImport).toContain('createOnboardingTelemetryIdentity,')
+    expect(analyticsImport).toContain("} from '~/utils/onboardingProgressAnalytics'")
 
     const initializer = sourceBetween('function initializeProgressTracking(', 'function completeAndViewStep(')
     expect(initializer).toContain(`flow: props.preOrg ? 'pre_org' : 'existing_org'`)
diff --git a/tests/app-onboarding-v3.unit.test.ts b/tests/app-onboarding-v3.unit.test.ts
index 18f49751a8..f52f8d3c28 100644
--- a/tests/app-onboarding-v3.unit.test.ts
+++ b/tests/app-onboarding-v3.unit.test.ts
@@ -118,6 +118,16 @@ describe('pre-organization onboarding v3', () => {
     expect(onboardingSource).toContain('used_fallback: createResult.wasRetried')
   })
 
+  it.concurrent('classifies restored draft icon data as a file in creation telemetry', () => {
+    const iconSource = onboardingSource.slice(
+      onboardingSource.indexOf('const selectedAppIconSource = computed'),
+      onboardingSource.indexOf('function createAiHelpPrompt()'),
+    )
+    expect(iconSource).toContain('resolveOnboardingAppIconSource({')
+    expect(iconSource).toContain('hasSelectedIconFile: Boolean(selectedIconFile.value)')
+    expect(iconSource).toContain('localIconPreview: localIconPreview.value')
+  })
+
   it.concurrent('tracks icon-only store import interactions and outcomes', () => {
     expect(onboardingSource).toContain("'onboarding_store_icon_import_shown' : 'onboarding_store_icon_import_hidden'")
     expect(onboardingSource).toContain("trackDetailsEvent('onboarding_store_icon_import_submitted'")
diff --git a/tests/onboarding-progress-analytics.unit.test.ts b/tests/onboarding-progress-analytics.unit.test.ts
index 9273dd0a9e..4af929eb1e 100644
--- a/tests/onboarding-progress-analytics.unit.test.ts
+++ b/tests/onboarding-progress-analytics.unit.test.ts
@@ -3,6 +3,7 @@ import {
   createOnboardingProgressTracker,
   createOnboardingTelemetryIdentity,
   ONBOARDING_ANALYTICS_VERSION,
+  resolveOnboardingAppIconSource,
 } from '../src/utils/onboardingProgressAnalytics'
 
 const steps = ['intent', 'details', 'organization', 'setup'] as const
@@ -17,6 +18,26 @@ const trackerIdentity = {
 }
 
 describe('onboarding progress analytics', () => {
+  it.concurrent('classifies restored draft icon data as a file source', () => {
+    expect(resolveOnboardingAppIconSource({
+      canUseStoreImportPreview: true,
+      hasSelectedIconFile: false,
+      localIconPreview: 'data:image/png;base64,restored-icon',
+    })).toBe('file')
+
+    expect(resolveOnboardingAppIconSource({
+      canUseStoreImportPreview: true,
+      hasSelectedIconFile: false,
+      localIconPreview: 'https://capgo.test/restored-icon.png',
+    })).toBe('store')
+
+    expect(resolveOnboardingAppIconSource({
+      canUseStoreImportPreview: false,
+      hasSelectedIconFile: false,
+      localIconPreview: '',
+    })).toBe('none')
+  })
+
   it.concurrent('keeps the resumed attempt while continuing from saved progress', () => {
     const capture = vi.fn()
     const ids = [ATTEMPT_A2, RUN_R2_UUID]

From 3921828da06d038fdb8710004e651059d0e0a4de Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 18 Aug 2026 13:14:34 +0200
Subject: [PATCH 10/10] fix(onboarding): address creation review findings

---
 .../dashboard/AppOnboardingFlow.vue           | 83 +++++++++++++------
 tests/app-onboarding-v3.unit.test.ts          | 58 +++++++++++++
 2 files changed, 117 insertions(+), 24 deletions(-)

diff --git a/src/components/dashboard/AppOnboardingFlow.vue b/src/components/dashboard/AppOnboardingFlow.vue
index 41f2601618..91fff19abd 100644
--- a/src/components/dashboard/AppOnboardingFlow.vue
+++ b/src/components/dashboard/AppOnboardingFlow.vue
@@ -145,6 +145,8 @@ const isSeedingDemo = ref(false)
 const isCliCommandVisible = ref(false)
 const apiKey = ref<string | null>(null)
 const createdApp = ref<AppRow | null>(null)
+const preOrgCreatedOrganizationId = ref<string | null>(null)
+const preOrgShouldInvite = ref(false)
 const reportedSetupSource = ref<'manual' | 'cli' | 'mcp' | 'ai' | null>(null)
 const flowStep = ref<OnboardingFlowStep>('details')
 const appDetailsStep = ref<AppDetailsStep>('name')
@@ -174,6 +176,9 @@ const hasEditedOrgName = ref(false)
 const estimatedUsersIndex = ref<number | null>(null)
 const isStoreImportOpen = ref(false)
 const isStoreIconImportOpen = ref(false)
+const isAppDetailsNavigationPending = computed(() => (
+  isSubmitting.value || isImportingStore.value || isImportingStoreIcon.value
+))
 const isOrganizationImportOpen = ref(false)
 const isImportingOrganizationWebsite = ref(false)
 const organizationWebsiteInput = ref('')
@@ -585,6 +590,8 @@ function resetOnboardingForm() {
   isStoreImportOpen.value = false
   isStoreIconImportOpen.value = false
   createdApp.value = null
+  preOrgCreatedOrganizationId.value = null
+  preOrgShouldInvite.value = false
   selectedIconFile.value = null
   if (localIconPreview.value.startsWith('blob:'))
     URL.revokeObjectURL(localIconPreview.value)
@@ -764,8 +771,13 @@ function getStoreUrls(url: string) {
 
 let storeImportRun = 0
 let storeIconImportRun = 0
-function resetStoreImportState() {
+function cancelPendingStoreImport() {
   storeImportRun += 1
+  isImportingStore.value = false
+}
+
+function resetStoreImportState() {
+  cancelPendingStoreImport()
   cancelPendingStoreIconImport()
   storeUrl.value = ''
   storeIconPreview.value = ''
@@ -878,6 +890,7 @@ async function importStoreMetadata() {
   if (!requestedUrl)
     return
 
+  cancelPendingStoreIconImport()
   existingApp.value = true
   existingAppSetup.value = 'import'
   trackDetailsEvent('onboarding_store_import_submitted')
@@ -946,6 +959,7 @@ async function importStoreIcon() {
   if (!requestedUrl)
     return
 
+  cancelPendingStoreImport()
   trackDetailsEvent('onboarding_store_icon_import_submitted')
   const requestedRun = ++storeIconImportRun
   isImportingStoreIcon.value = true
@@ -1245,10 +1259,23 @@ function viewPreviousAppDetailsStep() {
 }
 
 function finishAppDetails() {
-  if (props.preOrg)
+  if (props.preOrg && preOrgCreatedOrganizationId.value) {
+    void completePreOrgAppCreation(preOrgCreatedOrganizationId.value, preOrgShouldInvite.value)
+  }
+  else if (props.preOrg) {
     continuePreOrgDetails()
-  else
+  }
+  else {
     void createAppRecord()
+  }
+}
+
+function returnToAppIdAfterConflict() {
+  const previousAnalyticsStep = analyticsStepFor(flowStep.value)
+  flowStep.value = 'details'
+  appDetailsStep.value = 'app_id'
+  progressTracker?.viewStep('app_id', previousAnalyticsStep)
+  schedulePersistOnboardingProgress()
 }
 
 async function uploadIcon(appId: string, iconSourceUrl?: string) {
@@ -1471,29 +1498,35 @@ async function createOrganizationAndApp() {
       return
     }
 
-    clearOnboardingAppDraft(onboardingUserId.value)
-    await createAppRecord({ nextStep: shouldInvite ? 'organization' : 'setup' })
+    preOrgCreatedOrganizationId.value = data.id
+    preOrgShouldInvite.value = shouldInvite
+    await completePreOrgAppCreation(data.id, shouldInvite)
+  }
+  finally {
+    isSubmitting.value = false
+  }
+}
 
-    if (!createdApp.value)
-      return
+async function completePreOrgAppCreation(organizationId: string, shouldInvite: boolean) {
+  await createAppRecord({ nextStep: shouldInvite ? 'organization' : 'setup' })
 
-    await uploadImportedOrganizationLogo(data.id)
-    showOrganizationInvite.value = shouldInvite
-    if (shouldInvite)
-      trackOrganizationEvent('onboarding_organization_invite_viewed')
+  if (!createdApp.value)
+    return
 
-    removeBeforeUnloadWarning()
+  clearOnboardingAppDraft(onboardingUserId.value)
+  await uploadImportedOrganizationLogo(organizationId)
+  showOrganizationInvite.value = shouldInvite
+  if (shouldInvite)
+    trackOrganizationEvent('onboarding_organization_invite_viewed')
 
-    try {
-      await loadApiKey()
-    }
-    catch (apiKeyError) {
-      console.error('Cannot ensure API key', apiKeyError)
-      toast.error(t('app-onboarding-toast-apikey-error'))
-    }
+  removeBeforeUnloadWarning()
+
+  try {
+    await loadApiKey()
   }
-  finally {
-    isSubmitting.value = false
+  catch (apiKeyError) {
+    console.error('Cannot ensure API key', apiKeyError)
+    toast.error(t('app-onboarding-toast-apikey-error'))
   }
 }
 
@@ -1590,6 +1623,7 @@ async function createAppRecord(options?: { nextStep?: StandardFlowStep | PreOrgF
         appIdFeedback.value = t('app-onboarding-appid-taken-pick-another', {
           appId: createResult.originalAppId,
         })
+        returnToAppIdAfterConflict()
         toast.error(appIdFeedback.value)
         return
       }
@@ -2105,7 +2139,7 @@ defineExpose({
                 <button
                   type="button"
                   :aria-pressed="existingApp === true"
-                  class="group flex min-h-32 items-start gap-4 rounded-2xl border p-4 text-left transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-white dark:focus-visible:ring-offset-slate-900"
+                  class="d-btn group h-auto min-h-32 w-full items-start justify-start gap-4 whitespace-normal rounded-2xl border p-4 text-left transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-white dark:focus-visible:ring-offset-slate-900"
                   :class="whiteCardToggleButtonClass(existingApp === true)"
                   data-test="app-onboarding-existing-yes"
                   @click="existingApp = true"
@@ -2127,7 +2161,7 @@ defineExpose({
                 <button
                   type="button"
                   :aria-pressed="existingApp === false"
-                  class="group flex min-h-32 items-start gap-4 rounded-2xl border p-4 text-left transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-white dark:focus-visible:ring-offset-slate-900"
+                  class="d-btn group h-auto min-h-32 w-full items-start justify-start gap-4 whitespace-normal rounded-2xl border p-4 text-left transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 focus-visible:ring-offset-white dark:focus-visible:ring-offset-slate-900"
                   :class="whiteCardToggleButtonClass(existingApp === false)"
                   data-test="app-onboarding-existing-no"
                   @click="existingApp = false"
@@ -2366,6 +2400,7 @@ defineExpose({
                     type="button"
                     class="d-btn min-h-12"
                     :class="whiteCardSecondaryButtonClass()"
+                    :disabled="isAppDetailsNavigationPending"
                     @click="appDetailsStep === 'name' ? (props.preOrg ? viewPreviousStep('intent') : router.push('/apps')) : viewPreviousAppDetailsStep()"
                   >
                     {{ appDetailsStep === 'name' && !props.preOrg ? t('button-cancel') : t('button-back') }}
@@ -2375,7 +2410,7 @@ defineExpose({
                       type="button"
                       class="d-btn min-h-12"
                       :class="whiteCardPrimaryButtonClass()"
-                      :disabled="isSubmitting"
+                      :disabled="isAppDetailsNavigationPending"
                       :data-test="appDetailsStep === 'app_id' && !hasProvidedAppId ? 'app-onboarding-skip-app-id' : 'app-onboarding-continue'"
                       @click="continueFromCurrentAppDetailsStep"
                     >
diff --git a/tests/app-onboarding-v3.unit.test.ts b/tests/app-onboarding-v3.unit.test.ts
index f52f8d3c28..eaf4b5df62 100644
--- a/tests/app-onboarding-v3.unit.test.ts
+++ b/tests/app-onboarding-v3.unit.test.ts
@@ -92,6 +92,11 @@ describe('pre-organization onboarding v3', () => {
     expect(onboardingSource).toContain('v-if="!props.preOrg && appDetailsStep === \'name\'" class="grid gap-3 sm:grid-cols-2"')
     expect(onboardingSource).toContain('existingApp.value = props.preOrg ? true : null')
     expect(onboardingSource).toContain("toast.error(t('app-onboarding-toast-existing-required'))")
+    const appChoice = onboardingSource.slice(
+      onboardingSource.indexOf('v-if="!props.preOrg && appDetailsStep === \'name\'"'),
+      onboardingSource.indexOf('<div class="contents">'),
+    )
+    expect(appChoice.match(/class="d-btn group h-auto min-h-32/g)).toHaveLength(2)
   })
 
   it.concurrent('does not restore a skipped generated App ID as a manual choice', () => {
@@ -137,6 +142,28 @@ describe('pre-organization onboarding v3', () => {
     expect(resetStoreImportState).toContain('cancelPendingStoreIconImport()')
   })
 
+  it.concurrent('invalidates the opposite import before either store request starts', () => {
+    const metadataImport = onboardingSource.slice(
+      onboardingSource.indexOf('async function importStoreMetadata()'),
+      onboardingSource.indexOf('function cancelPendingStoreIconImport()'),
+    )
+    expect(metadataImport).toContain('cancelPendingStoreIconImport()')
+    expect(metadataImport.indexOf('cancelPendingStoreIconImport()')).toBeLessThan(metadataImport.indexOf('const requestedRun = ++storeImportRun'))
+
+    const iconImport = onboardingSource.slice(
+      onboardingSource.indexOf('async function importStoreIcon()'),
+      onboardingSource.indexOf('function toggleStoreImport()'),
+    )
+    expect(iconImport).toContain('cancelPendingStoreImport()')
+    expect(iconImport.indexOf('cancelPendingStoreImport()')).toBeLessThan(iconImport.indexOf('const requestedRun = ++storeIconImportRun'))
+  })
+
+  it.concurrent('blocks app-details navigation while either store import is pending', () => {
+    expect(onboardingSource).toContain('const isAppDetailsNavigationPending = computed(() => (')
+    expect(onboardingSource).toContain('isSubmitting.value || isImportingStore.value || isImportingStoreIcon.value')
+    expect(onboardingSource.match(/:disabled="isAppDetailsNavigationPending"/g)).toHaveLength(2)
+  })
+
   it.concurrent('continues to organization creation after the pre-org icon step', () => {
     expect(onboardingSource).toContain("? props.preOrg\n                          ? t('app-onboarding-continue')\n                          : t('app-onboarding-finish-details')")
   })
@@ -226,6 +253,37 @@ describe('pre-organization onboarding v3', () => {
     expect(creation.indexOf('await createAppRecord(')).toBeLessThan(creation.indexOf('showOrganizationInvite.value = shouldInvite'))
   })
 
+  it.concurrent('retries only app creation after an App ID conflict created the organization', () => {
+    const finishDetails = onboardingSource.slice(
+      onboardingSource.indexOf('function finishAppDetails()'),
+      onboardingSource.indexOf('function returnToAppIdAfterConflict()'),
+    )
+    expect(finishDetails).toContain('preOrgCreatedOrganizationId.value')
+    expect(finishDetails).toContain('completePreOrgAppCreation(preOrgCreatedOrganizationId.value, preOrgShouldInvite.value)')
+
+    const conflictRecovery = onboardingSource.slice(
+      onboardingSource.indexOf('function returnToAppIdAfterConflict()'),
+      onboardingSource.indexOf('async function uploadIcon('),
+    )
+    expect(conflictRecovery).toContain("flowStep.value = 'details'")
+    expect(conflictRecovery).toContain("appDetailsStep.value = 'app_id'")
+    expect(conflictRecovery).toContain("progressTracker?.viewStep('app_id', previousAnalyticsStep)")
+
+    const organizationCreation = onboardingSource.slice(
+      onboardingSource.indexOf('async function createOrganizationAndApp()'),
+      onboardingSource.indexOf('async function createAppRecord('),
+    )
+    expect(organizationCreation).toContain('preOrgCreatedOrganizationId.value = data.id')
+    expect(organizationCreation).toContain('await completePreOrgAppCreation(data.id, shouldInvite)')
+    expect(organizationCreation).toContain("await createAppRecord({ nextStep: shouldInvite ? 'organization' : 'setup' })")
+
+    const appCreation = onboardingSource.slice(
+      onboardingSource.indexOf('async function createAppRecord('),
+      onboardingSource.indexOf('async function seedDemoData()'),
+    )
+    expect(appCreation).toContain('returnToAppIdAfterConflict()')
+  })
+
   it.concurrent('shows technical delegation unconditionally on pre-org setup', () => {
     expect(onboardingSource).toContain("flowStep === 'setup' && createdApp")
     expect(onboardingSource).toContain("!props.preOrg && flowStep === 'choice'")