diff --git a/cli/src/types/supabase.types.ts b/cli/src/types/supabase.types.ts
index 2b26f41cf5..2b1e568410 100644
--- a/cli/src/types/supabase.types.ts
+++ b/cli/src/types/supabase.types.ts
@@ -335,6 +335,7 @@ export type Database = {
           rollout_paused_version_names: string[]
           name: string | null
           need_onboarding: boolean
+          onboarding: Json
           onboarding_completed_at: string | null
           owner_org: string
           retention: number
@@ -367,6 +368,7 @@ export type Database = {
           rollout_paused_version_names?: string[]
           name?: string | null
           need_onboarding?: boolean
+          onboarding?: Json
           onboarding_completed_at?: string | null
           owner_org: string
           retention?: number
@@ -399,6 +401,7 @@ export type Database = {
           rollout_paused_version_names?: string[]
           name?: string | null
           need_onboarding?: boolean
+          onboarding?: Json
           onboarding_completed_at?: string | null
           owner_org?: string
           retention?: number
@@ -3640,6 +3643,7 @@ export type Database = {
           manifest_bundle_count: number
           name: string | null
           need_onboarding: boolean
+          onboarding: Json
           onboarding_completed_at: string | null
           owner_org: string
           retention: number
@@ -4326,6 +4330,10 @@ export type Database = {
         Returns: boolean
       }
       mark_app_stats_refreshed: { Args: { p_app_id: string }; Returns: string }
+      mark_onboarding_feature_started: {
+        Args: { p_app_id: string, p_feature_key: string }
+        Returns: Json
+      }
       mass_edit_queue_messages_cf_ids: {
         Args: {
           updates: Database["public"]["CompositeTypes"]["message_update"][]
diff --git a/docs/pr-assets/app-onboarding-dashboard.webp b/docs/pr-assets/app-onboarding-dashboard.webp
new file mode 100644
index 0000000000..1344752ec1
Binary files /dev/null and b/docs/pr-assets/app-onboarding-dashboard.webp differ
diff --git a/docs/pr-assets/getting-started-dashboard.webp b/docs/pr-assets/getting-started-dashboard.webp
new file mode 100644
index 0000000000..e7020070ea
Binary files /dev/null and b/docs/pr-assets/getting-started-dashboard.webp differ
diff --git a/docs/pr-assets/getting-started-page-dark.webp b/docs/pr-assets/getting-started-page-dark.webp
new file mode 100644
index 0000000000..ff86414f43
Binary files /dev/null and b/docs/pr-assets/getting-started-page-dark.webp differ
diff --git a/docs/pr-assets/getting-started-page.webp b/docs/pr-assets/getting-started-page.webp
new file mode 100644
index 0000000000..c6356fb672
Binary files /dev/null and b/docs/pr-assets/getting-started-page.webp differ
diff --git a/messages/en.context.json b/messages/en.context.json
index e6ef235495..f01ceb8f6b 100644
--- a/messages/en.context.json
+++ b/messages/en.context.json
@@ -680,7 +680,9 @@
   "bundle-not-found-description": "Used in Capgo web console areas: pages/app. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "bundle-number": "Used in Capgo web console areas: components/tables, pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "bundle-to-production-device": "Used in Capgo web console areas: pages/admin/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "bundle-to-store-live": "Used in Capgo web console areas: pages/admin/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "bundle-to-subscribed": "Used in Capgo web console areas: pages/admin/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "bundle-to-testflight": "Used in Capgo web console areas: pages/admin/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "bundle_uploads": "Used in Capgo web console areas: components/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "bundles": "Used in Capgo web console areas: components/tables, constants, layouts, stores. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "bundles-deleted": "Used in Capgo web console areas: components/tables. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
@@ -1265,6 +1267,13 @@
   "disableAutoUpdateToMajor": "Used in Capgo web console areas: pages/app, services, types. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "disabled": "Used in Capgo web console areas: components, components/bundle, components/forms, components/organizations, pages. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "disabled-capgo-updates": "Used in Capgo web console areas: components/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "distribution-stage": "Used in Capgo web console areas: pages/admin/dashboard. Role: table column label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "distribution-stage-local-only": "Used in Capgo web console areas: pages/admin/dashboard. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "distribution-stage-native-unknown": "Used in Capgo web console areas: pages/admin/dashboard. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "distribution-stage-no-device": "Used in Capgo web console areas: pages/admin/dashboard. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "distribution-stage-play-unknown": "Used in Capgo web console areas: pages/admin/dashboard. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "distribution-stage-store-live": "Used in Capgo web console areas: pages/admin/dashboard. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "distribution-stage-testflight": "Used in Capgo web console areas: pages/admin/dashboard. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "discord": "Used in Capgo web console areas: components. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "discord-username": "Used in Capgo web console areas: components/dashboard, pages/settings/account. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "discord-username-help": "Used in Capgo web console areas: components/dashboard, pages/settings/account. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
@@ -1477,6 +1486,21 @@
   "generated-new-apikey": "Used in Capgo web console areas: pages. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "get": "Used in Capgo web console areas: components/dashboard, services, types. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "get-started": "Used in Capgo web console areas: pages. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started": "Used in Capgo web console areas: pages/app, components. Role: section or dialog title. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-action-explore": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-action-setup": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-action-validate": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-complete": "Used in Capgo web console areas: pages/app. Role: UI sentence. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-complete-desc": "Used in Capgo web console areas: pages/app. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-count": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-description": "Used in Capgo web console areas: pages/app. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-dismiss": "Used in Capgo web console areas: components. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-done": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-essential": "Used in Capgo web console areas: pages/app. Role: section or dialog title. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-grow": "Used in Capgo web console areas: pages/app. Role: section or dialog title. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-live-update": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-live-update-desc": "Used in Capgo web console areas: pages/app. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "getting-started-percent": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "github-stars-trend": "Used in Capgo web console. Role: UI label about \"github stars trend\". Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "github-username": "Used in Capgo web console areas: components/dashboard, composables, pages/settings/account. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "github-username-confirm": "Used in Capgo web console areas: components/dashboard. Role: short UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
@@ -1931,6 +1955,14 @@
   "onboarding-invite-option-title": "Used in Capgo web console areas: components/dashboard. Role: section or dialog title. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "onboarding-manual-setup-link": "Used in Capgo web console areas: components/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "onboarding-manual-setup-prefix": "Used in Capgo web console areas: components/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "onboarding-next-builder": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "onboarding-next-builder-desc": "Used in Capgo web console areas: pages/app. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "onboarding-next-cli-install": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "onboarding-next-cli-install-desc": "Used in Capgo web console areas: pages/app. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "onboarding-next-ota-device": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "onboarding-next-ota-device-desc": "Used in Capgo web console areas: pages/app. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "onboarding-next-ota-store": "Used in Capgo web console areas: pages/app. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "onboarding-next-ota-store-desc": "Used in Capgo web console areas: pages/app. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "onboarding-prerequisites-built": "Used in Capgo web console areas: components/dashboard. Role: UI sentence. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "onboarding-prerequisites-capacitor": "Used in Capgo web console areas: components/dashboard. Role: UI sentence. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "onboarding-prerequisites-cli-desc": "Used in Capgo web console areas: components/dashboard. Role: helper or description text. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
@@ -2285,6 +2317,10 @@
   "rbac-system-enabled-body": "Used in Capgo web console. Role: UI sentence about \"rbac system enabled body\". Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "read-the-documentation": "Used in Capgo web console. Role: UI label about \"read the documentation\". Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "read-value": "Used in Capgo web console areas: pages. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "reached-app-store-live": "Used in Capgo web console areas: pages/admin/dashboard. Role: current App Store live count among orgs that uploaded a bundle in 7 days, not a sequential funnel step. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "reached-app-store-live-within-7-days": "Used in Capgo web console areas: pages/admin/dashboard. Role: trend of current App Store live among that signup day's 7-day bundle orgs. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "reached-testflight": "Used in Capgo web console areas: pages/admin/dashboard. Role: current TestFlight-only count among orgs that uploaded a bundle in 7 days, parallel to App Store live. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
+  "reached-testflight-within-7-days": "Used in Capgo web console areas: pages/admin/dashboard. Role: trend of current TestFlight-only among that signup day's 7-day bundle orgs. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "reason-optional": "Used in Capgo web console areas: components/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "reason-placeholder": "Used in Capgo web console areas: components/dashboard. Role: input placeholder. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
   "recent-releases-active": "Used in Capgo web console areas: components/dashboard. Role: UI label. Translate for UI; keep Capgo product names, code, and placeholders unchanged.",
diff --git a/messages/en.json b/messages/en.json
index d68e741cd8..952b4957d6 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -270,11 +270,47 @@
   "admin-debug-trigger-toast": "Run replication toast simulation",
   "activation-telemetry-unavailable": "Activation telemetry is unavailable for this date range. Select a range within the last 3 months.",
   "bundle-to-production-device": "Bundle → Production device",
+  "bundle-to-testflight": "Bundle → TestFlight",
+  "bundle-to-store-live": "Bundle → App Store live",
   "completed-update-download": "Completed update download",
-  "completed-update-download-within-7-days": "Completed Update Download (within 7 days)",
+  "completed-update-download-within-7-days": "Completed update download (within 7 days)",
   "production-device-to-update-download": "Production device → Update download",
   "production-plugin-device": "Production plugin device",
-  "production-plugin-device-within-7-days": "Production Plugin Device (within 7 days)",
+  "production-plugin-device-within-7-days": "Production plugin device (within 7 days)",
+  "reached-testflight": "Currently TestFlight",
+  "reached-testflight-within-7-days": "Currently TestFlight (7-day bundle orgs)",
+  "reached-app-store-live": "Currently App Store live",
+  "reached-app-store-live-within-7-days": "Currently App Store live (7-day bundle orgs)",
+  "distribution-stage": "Distribution",
+  "distribution-stage-no-device": "No device",
+  "distribution-stage-local-only": "Local only",
+  "distribution-stage-native-unknown": "Native unknown",
+  "distribution-stage-play-unknown": "Play (track unknown)",
+  "distribution-stage-testflight": "TestFlight",
+  "distribution-stage-store-live": "App Store live",
+  "onboarding-next-cli-install": "Install Capgo on a device",
+  "onboarding-next-cli-install-desc": "Run the CLI install command, then open the app so Capgo can see a real device.",
+  "onboarding-next-ota-device": "Open the app on a device",
+  "onboarding-next-ota-device-desc": "Capgo has not seen a TestFlight or store install yet. Launch the app from TestFlight or a store build.",
+  "onboarding-next-ota-store": "Ship a live store build",
+  "onboarding-next-ota-store-desc": "Devices are on TestFlight or an unknown store track. A live App Store install is the next proof point.",
+  "onboarding-next-builder": "Finish your first native build",
+  "onboarding-next-builder-desc": "A native build was started but has not succeeded yet. Complete it to keep going.",
+  "getting-started": "Getting started",
+  "getting-started-description": "Complete these steps to launch live updates for this app.",
+  "getting-started-count": "{done} of {total}",
+  "getting-started-percent": "{percent}%",
+  "getting-started-essential": "Essential setup",
+  "getting-started-grow": "Grow your app",
+  "getting-started-done": "Done",
+  "getting-started-action-setup": "Set up",
+  "getting-started-action-validate": "Validate",
+  "getting-started-action-explore": "Explore",
+  "getting-started-dismiss": "Hide getting started",
+  "getting-started-complete": "Live Update is set up",
+  "getting-started-complete-desc": "You can keep using this checklist for production checks and Builder.",
+  "getting-started-live-update": "Ship a live update",
+  "getting-started-live-update-desc": "Upload a bundle so devices can receive an over-the-air update.",
   "all-billing-cycles": "All billing cycles",
   "all-bundles": "All bundles",
   "all-plans": "All plans",
diff --git a/playwright/e2e/compatibility-events.spec.ts b/playwright/e2e/compatibility-events.spec.ts
index 8c30663650..ab9bc94274 100644
--- a/playwright/e2e/compatibility-events.spec.ts
+++ b/playwright/e2e/compatibility-events.spec.ts
@@ -81,6 +81,50 @@ async function mockCompatibilityEvents(page: Page, rows: () => Record<string, un
   })
 }
 
+async function mockGettingStartedLedger(page: Page) {
+  const ledger = {
+    features: {
+      cli_install: { succeeded_at: '2026-08-01T00:00:00.000Z' },
+      ota: { succeeded_at: '2026-08-02T00:00:00.000Z', stage: 'testflight' },
+    },
+  }
+
+  await page.route('**/rest/v1/apps*', async (route: Route) => {
+    if (route.request().method() !== 'GET') {
+      await route.fallback()
+      return
+    }
+
+    const response = await route.fetch()
+    const contentType = response.headers()['content-type'] ?? ''
+    if (!contentType.includes('json')) {
+      await route.fulfill({ response })
+      return
+    }
+
+    const json = await response.json() as unknown
+    const patchRow = (row: Record<string, unknown>) => {
+      if (row.app_id !== APP_ID)
+        return row
+      return { ...row, onboarding: ledger }
+    }
+    const body = Array.isArray(json)
+      ? json.map(row => (row && typeof row === 'object' ? patchRow(row as Record<string, unknown>) : row))
+      : (json && typeof json === 'object' && 'app_id' in json
+          ? patchRow(json as Record<string, unknown>)
+          : json)
+
+    const headers = { ...response.headers() }
+    delete headers['content-length']
+    delete headers['content-encoding']
+    await route.fulfill({
+      status: response.status(),
+      headers,
+      body: JSON.stringify(body),
+    })
+  })
+}
+
 async function mockStoreReleaseValidationStatus(page: Page) {
   await page.route('**/rest/v1/app_versions*', async (route: Route) => {
     const url = new URL(route.request().url())
@@ -114,34 +158,30 @@ test.describe('Compatibility events', () => {
     }, TEST_USER_ID)
   })
 
-  test('shows the store release validation alert before opening the modal', async ({ page }) => {
+  test('opens store release validation from getting started', async ({ page }) => {
     await mockCompatibilityEvents(page, () => [])
-
+    await mockGettingStartedLedger(page)
     await mockStoreReleaseValidationStatus(page)
-    await page.goto(`/app/${APP_ID}`)
+    await page.goto(`/app/${APP_ID}/getting-started`)
 
-    const alert = page.locator('[data-test="store-release-validation-alert"]')
+    const storeStep = page.locator('[data-test="getting-started-step-store_release"]')
     const modal = page.getByRole('dialog')
-    await expect(alert).toBeVisible()
-    await expect(alert.getByText('Production release check')).toBeVisible()
-    await expect(alert.getByText('Live Update bundle detected')).toBeVisible()
+    await expect(page.locator('[data-test="getting-started-page"]')).toBeVisible()
+    await expect(page.getByRole('button', { name: /^bundles$/i })).toHaveCount(0)
+    await expect(storeStep).toBeVisible()
+    await expect(storeStep.locator('[data-test="getting-started-step-action"]')).toBeVisible()
     await expect(modal).not.toBeVisible()
 
-    await alert.locator('[data-test="store-release-validation-open"]').click()
+    await storeStep.locator('[data-test="getting-started-step-action"]').click()
     await expect(modal).toBeVisible()
     await expect(modal.getByText('Is this app published with Capgo in production?')).toBeVisible()
 
     await modal.getByRole('button', { name: 'Later' }).click()
     await expect(modal).not.toBeVisible()
-    await expect(alert).toBeVisible()
     await page.waitForTimeout(1000)
     await expect(modal).not.toBeVisible()
 
-    await alert.locator('[data-test="store-release-validation-dismiss"]').click()
-    await expect(alert).not.toBeVisible()
-    await page.reload()
-    await expect(alert).toBeVisible()
-    await alert.locator('[data-test="store-release-validation-open"]').click()
+    await storeStep.locator('[data-test="getting-started-step-action"]').click()
     await expect(modal).toBeVisible()
     await modal.getByRole('button', { name: 'Yes, app is published' }).click()
 
@@ -158,11 +198,6 @@ test.describe('Compatibility events', () => {
     await mockCompatibilityEvents(page, () => [unresolvedEvent()])
 
     await page.goto(`/app/${APP_ID}`)
-
-    const storeReleaseValidationAlert = page.locator('[data-test="store-release-validation-alert"]')
-    await storeReleaseValidationAlert.waitFor({ state: 'visible', timeout: 5000 }).catch(() => undefined)
-    if (await storeReleaseValidationAlert.isVisible())
-      await storeReleaseValidationAlert.locator('[data-test="store-release-validation-dismiss"]').click()
     // The banner exposes a stable data-test hook; keep the copy assertions for
     // content correctness but locate the CTA via its data-test attribute.
     const banner = page.locator('[data-test="compatibility-banner"]')
diff --git a/playwright/visual-diff.config.ts b/playwright/visual-diff.config.ts
index e18d58de3c..dbbdebc246 100644
--- a/playwright/visual-diff.config.ts
+++ b/playwright/visual-diff.config.ts
@@ -18,6 +18,7 @@ export const visualDiffRoutes: VisualDiffRoute[] = [
   { slug: 'dashboard', path: '/dashboard', auth: true },
   { slug: 'apps', path: '/apps', auth: true },
   { slug: 'app-overview', path: '/app/com.demo.app', auth: true },
+  { slug: 'app-getting-started', path: '/app/com.demo.app/getting-started', auth: true },
   { slug: 'app-settings', path: '/app/com.demo.app/settings', auth: true },
   { slug: 'app-settings-access', path: '/app/com.demo.app/settings/access', auth: true },
   { slug: 'channels', path: '/app/com.demo.app/channels', auth: true },
diff --git a/read_replicate/schema_replicate.catalog.json b/read_replicate/schema_replicate.catalog.json
index f7b40ad9f5..660431ed92 100644
--- a/read_replicate/schema_replicate.catalog.json
+++ b/read_replicate/schema_replicate.catalog.json
@@ -530,6 +530,16 @@
       "table": "apps",
       "type": "timestamp with time zone"
     },
+    {
+      "default": "'{}'::jsonb",
+      "generated": "",
+      "identity": "",
+      "name": "onboarding",
+      "notNull": true,
+      "position": 31,
+      "table": "apps",
+      "type": "jsonb"
+    },
     {
       "default": "now()",
       "generated": "",
@@ -1770,6 +1780,13 @@
       "type": "u",
       "valid": true
     },
+    {
+      "definition": "CHECK (jsonb_typeof(onboarding) = 'object'::text AND (NOT onboarding ? 'features'::text OR jsonb_typeof(onboarding -> 'features'::text) = 'object'::text))",
+      "name": "apps_onboarding_valid",
+      "table": "apps",
+      "type": "c",
+      "valid": true
+    },
     {
       "definition": "PRIMARY KEY (app_id)",
       "name": "apps_pkey",
@@ -2136,6 +2153,20 @@
       "table": "apps",
       "valid": true
     },
+    {
+      "constraintOwned": false,
+      "definition": "CREATE INDEX idx_apps_onboarding_ota_stage ON public.apps USING btree (((((onboarding -> 'features'::text) -> 'ota'::text) ->> 'stage'::text)))",
+      "name": "idx_apps_onboarding_ota_stage",
+      "table": "apps",
+      "valid": true
+    },
+    {
+      "constraintOwned": false,
+      "definition": "CREATE INDEX idx_apps_onboarding_refreshed_at ON public.apps USING btree (COALESCE((onboarding ->> 'refreshed_at'::text), ''::text), app_id)",
+      "name": "idx_apps_onboarding_refreshed_at",
+      "table": "apps",
+      "valid": true
+    },
     {
       "constraintOwned": false,
       "definition": "CREATE UNIQUE INDEX idx_apps_owner_org_app_id ON public.apps USING btree (owner_org, app_id)",
diff --git a/read_replicate/schema_replicate.sql b/read_replicate/schema_replicate.sql
index ec28434c82..7b9496dc09 100644
--- a/read_replicate/schema_replicate.sql
+++ b/read_replicate/schema_replicate.sql
@@ -104,7 +104,9 @@ CREATE TABLE public.apps (
     rollout_paused_version_names character varying[] DEFAULT '{}'::character varying[] NOT NULL,
     created_from_onboarding boolean DEFAULT false NOT NULL,
     onboarding_completed_at timestamp with time zone,
-    CONSTRAINT apps_build_timeout_seconds_check CHECK (((build_timeout_seconds >= 300) AND (build_timeout_seconds <= 21600)))
+    onboarding jsonb DEFAULT '{}'::jsonb NOT NULL,
+    CONSTRAINT apps_build_timeout_seconds_check CHECK (((build_timeout_seconds >= 300) AND (build_timeout_seconds <= 21600))),
+    CONSTRAINT apps_onboarding_valid CHECK (((jsonb_typeof(onboarding) = 'object'::text) AND ((NOT (onboarding ? 'features'::text)) OR (jsonb_typeof((onboarding -> 'features'::text)) = 'object'::text))))
 );
 
 ALTER TABLE ONLY public.apps REPLICA IDENTITY FULL;
@@ -824,6 +826,20 @@ CREATE INDEX idx_apps_created_at ON public.apps USING btree (created_at);
 CREATE INDEX idx_apps_default_upload_channel ON public.apps USING btree (default_upload_channel);
 
 
+--
+-- Name: idx_apps_onboarding_ota_stage; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX idx_apps_onboarding_ota_stage ON public.apps USING btree (((((onboarding -> 'features'::text) -> 'ota'::text) ->> 'stage'::text)));
+
+
+--
+-- Name: idx_apps_onboarding_refreshed_at; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX idx_apps_onboarding_refreshed_at ON public.apps USING btree (COALESCE((onboarding ->> 'refreshed_at'::text), ''::text), app_id);
+
+
 --
 -- Name: idx_apps_owner_org_app_id; Type: INDEX; Schema: public; Owner: -
 --
diff --git a/src/components.d.ts b/src/components.d.ts
index 6489a232e4..04f83178b7 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -26,6 +26,7 @@ declare module 'vue' {
     AppNotFoundModal: typeof import('./components/AppNotFoundModal.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']
@@ -75,6 +76,7 @@ declare module 'vue' {
     DropdownProfile: typeof import('./components/dashboard/DropdownProfile.vue')['default']
     FailedCard: typeof import('./components/FailedCard.vue')['default']
     FilterModal: typeof import('./components/FilterModal.vue')['default']
+    GettingStartedNav: typeof import('./components/dashboard/GettingStartedNav.vue')['default']
     GitHubProfileDialog: typeof import('./components/dashboard/GitHubProfileDialog.vue')['default']
     GroupsRbacManager: typeof import('./components/organization/GroupsRbacManager.vue')['default']
     HistoryTable: typeof import('./components/tables/HistoryTable.vue')['default']
@@ -98,6 +100,7 @@ declare module 'vue' {
     RbacPermissionOnlyModal: typeof import('./components/RbacPermissionOnlyModal.vue')['default']
     ReleaseBanner: typeof import('./components/dashboard/ReleaseBanner.vue')['default']
     ReleaseStatusCard: typeof import('./components/dashboard/ReleaseStatusCard.vue')['default']
+    RoleCapabilitiesHint: typeof import('./components/forms/RoleCapabilitiesHint.vue')['default']
     RoleSelect: typeof import('./components/forms/RoleSelect.vue')['default']
     RoleSelectionModal: typeof import('./components/modals/RoleSelectionModal.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 62b36def8e..a8419b54fa 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -21,6 +21,7 @@ import {
   shouldConfirmOnboardingDashboardExploration,
 } from '~/utils/onboardingRedirect'
 import DropdownProfile from '../components/dashboard/DropdownProfile.vue'
+import GettingStartedNav from '../components/dashboard/GettingStartedNav.vue'
 
 const props = defineProps <{
   sidebarOpen: boolean
@@ -194,6 +195,8 @@ const tabs = computed<Tab[]>(() => {
         </router-link>
       </div>
 
+      <GettingStartedNav />
+
       <!-- Organization dropdown -->
       <div class="px-3 py-4 lg:py-4 lg:px-6 shrink-0">
         <dropdown-organization v-if="main.user" />
diff --git a/src/components/dashboard/AppOnboardingFlow.vue b/src/components/dashboard/AppOnboardingFlow.vue
index e88f8966b7..797f90d059 100644
--- a/src/components/dashboard/AppOnboardingFlow.vue
+++ b/src/components/dashboard/AppOnboardingFlow.vue
@@ -130,6 +130,45 @@ const planNameOrder = ['Solo', 'Maker', 'Team', 'Enterprise'] as const
 
 const localCommand = isLocal(config.supaHost) ? ` --supa-host ${config.supaHost} --supa-anon ${config.supaKey}` : ''
 const usesBuilderSetupCommand = computed(() => selectedIntent.value === 'builder')
+const markedOnboardingFeatures = new Set<string>()
+
+async function markOnboardingFeatureStarted(featureKey: 'cli_install' | 'ota' | 'builder') {
+  const appId = createdApp.value?.app_id
+  if (!appId)
+    return
+
+  const markKey = `${appId}:${featureKey}`
+  if (markedOnboardingFeatures.has(markKey))
+    return
+
+  for (let attempt = 0; attempt < 2; attempt++) {
+    markedOnboardingFeatures.add(markKey)
+    const { data, error } = await supabase.rpc('mark_onboarding_feature_started', {
+      p_app_id: appId,
+      p_feature_key: featureKey,
+    })
+    if (!error) {
+      organizationStore.updateAppOnboarding(appId, data)
+      return
+    }
+
+    markedOnboardingFeatures.delete(markKey)
+    if (attempt === 0) {
+      await new Promise(resolve => setTimeout(resolve, 400))
+      continue
+    }
+    console.error('Failed to mark onboarding feature started', error)
+  }
+}
+
+watch([flowStep, createdApp, usesBuilderSetupCommand], () => {
+  if (!createdApp.value)
+    return
+  if (flowStep.value === 'install' || (flowStep.value === 'setup' && !usesBuilderSetupCommand.value))
+    void markOnboardingFeatureStarted('cli_install')
+  if (flowStep.value === 'setup')
+    void markOnboardingFeatureStarted(usesBuilderSetupCommand.value ? 'builder' : 'ota')
+})
 const cliSubcommand = computed(() => usesBuilderSetupCommand.value ? 'build init' : 'i')
 const cliCommand = computed(() => {
   const key = apiKey.value
@@ -977,7 +1016,7 @@ async function seedDemoData() {
       name: createdApp.value.name ?? null,
       ownerOrgId: currentOrg.value.gid,
     })
-    router.push(`/app/${encodeURIComponent(createdApp.value.app_id)}?refresh=true`)
+    router.push(`/app/${encodeURIComponent(createdApp.value.app_id)}/getting-started`)
   }
   catch (error) {
     console.error('Cannot seed demo data', error)
@@ -1086,7 +1125,7 @@ function openDashboard() {
     })
   }
   allowOnboardingDashboardExploration(onboardingUserId.value, createdApp.value.app_id)
-  router.push(`/app/${encodeURIComponent(createdApp.value.app_id)}`)
+  router.push(`/app/${encodeURIComponent(createdApp.value.app_id)}/getting-started`)
 }
 
 onMounted(async () => {
diff --git a/src/components/dashboard/GettingStartedNav.vue b/src/components/dashboard/GettingStartedNav.vue
new file mode 100644
index 0000000000..fc3cdcbb06
--- /dev/null
+++ b/src/components/dashboard/GettingStartedNav.vue
@@ -0,0 +1,135 @@
+<script setup lang="ts">
+import type { OrganizationApp } from '~/stores/organization'
+import { computed, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useRoute, useRouter } from 'vue-router'
+import IconX from '~icons/lucide/x'
+import { useMainStore } from '~/stores/main'
+import { useOrganizationStore } from '~/stores/organization'
+import {
+  parseAppOnboardingLedger,
+  shouldShowGettingStartedNav,
+} from '~/utils/appOnboardingProgress'
+import {
+  dismissGettingStarted,
+  isGettingStartedDismissed,
+} from '~/utils/gettingStartedDismiss'
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+const main = useMainStore()
+const organizationStore = useOrganizationStore()
+const dismissedTick = ref(0)
+
+const userId = computed(() => main.user?.id ?? main.auth?.id ?? '')
+
+const apps = computed(() => {
+  void dismissedTick.value
+  const orgId = organizationStore.currentOrganization?.gid
+  if (!orgId || !userId.value)
+    return [] as OrganizationApp[]
+
+  return organizationStore.getAppsByOrgId(orgId).filter((app) => {
+    if (isGettingStartedDismissed(userId.value, app.app_id))
+      return false
+    return shouldShowGettingStartedNav(parseAppOnboardingLedger(app.onboarding))
+  })
+})
+
+function appLabel(app: OrganizationApp) {
+  return app.name || app.app_id
+}
+
+function acronym(name: string) {
+  const trimmed = name.trim()
+  if (!trimmed)
+    return '?'
+  const parts = trimmed.split(/\s+/)
+  const first = parts[0]?.[0] ?? ''
+  const second = parts.length > 1 ? (parts[1]?.[0] ?? '') : (parts[0]?.[1] ?? '')
+  return (first + second).toUpperCase()
+}
+
+function gettingStartedPath(appId: string) {
+  return `/app/${encodeURIComponent(appId)}/getting-started`
+}
+
+function isActive(appId: string) {
+  return route.path === gettingStartedPath(appId)
+}
+
+function dismiss(app: OrganizationApp, event: Event) {
+  event.preventDefault()
+  event.stopPropagation()
+  if (!userId.value)
+    return
+  dismissGettingStarted(userId.value, app.app_id)
+  dismissedTick.value += 1
+  if (isActive(app.app_id))
+    void router.push(`/app/${encodeURIComponent(app.app_id)}`)
+}
+
+watch(() => organizationStore.currentOrganization?.gid, async (orgId) => {
+  if (!orgId)
+    return
+  await organizationStore.awaitInitialLoad()
+  void organizationStore.refreshAppsOnboarding(orgId)
+}, { immediate: true })
+</script>
+
+<template>
+  <div v-if="apps.length" class="px-3 pt-3 lg:px-6" data-test="getting-started-nav">
+    <ul class="max-h-56 space-y-1 overflow-y-auto">
+      <li v-for="app in apps" :key="app.app_id">
+        <div
+          class="flex items-center gap-1 rounded-lg transition duration-150"
+          :class="isActive(app.app_id) ? 'bg-azure-500/20' : 'bg-azure-500/10 hover:bg-azure-500/20'"
+        >
+          <router-link
+            class="flex min-h-11 min-w-0 flex-1 items-center gap-2 px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-azure-500 focus:ring-offset-2 focus:ring-offset-slate-800"
+            :to="gettingStartedPath(app.app_id)"
+            :aria-current="isActive(app.app_id) ? 'page' : undefined"
+            :aria-label="`${t('getting-started')} — ${appLabel(app)}`"
+            data-test="getting-started-nav-link"
+          >
+            <img
+              v-if="app.icon_url"
+              :src="app.icon_url"
+              :alt="`${appLabel(app)} icon`"
+              class="size-6 shrink-0 rounded-sm object-cover d-mask d-mask-squircle"
+              width="24"
+              height="24"
+            >
+            <span
+              v-else-if="app.icon_url_loading"
+              class="flex size-6 shrink-0 items-center justify-center rounded-sm bg-slate-700 d-mask d-mask-squircle"
+            >
+              <span class="size-3 rounded-full border-2 border-azure-400 border-t-transparent animate-spin" />
+              <span class="sr-only">{{ t('loading') }}</span>
+            </span>
+            <span
+              v-else
+              class="flex size-6 shrink-0 items-center justify-center rounded-sm bg-slate-700 text-[10px] font-semibold text-slate-200 d-mask d-mask-squircle"
+              aria-hidden="true"
+            >
+              {{ acronym(appLabel(app)) }}
+            </span>
+            <span class="min-w-0 truncate text-sm font-medium text-azure-100">
+              {{ t('getting-started') }}
+            </span>
+          </router-link>
+          <button
+            type="button"
+            class="flex size-11 shrink-0 items-center justify-center rounded-lg text-slate-400 transition duration-150 hover:bg-slate-700/80 hover:text-white focus:outline-none focus:ring-2 focus:ring-azure-500 focus:ring-offset-2 focus:ring-offset-slate-800"
+            :aria-label="`${t('getting-started-dismiss')} — ${appLabel(app)}`"
+            data-test="getting-started-nav-dismiss"
+            @click="dismiss(app, $event)"
+          >
+            <IconX class="size-4" />
+          </button>
+        </div>
+      </li>
+    </ul>
+  </div>
+</template>
diff --git a/src/components/dashboard/StoreReleaseValidationModal.vue b/src/components/dashboard/StoreReleaseValidationModal.vue
index decb441fc9..083eab7e1c 100644
--- a/src/components/dashboard/StoreReleaseValidationModal.vue
+++ b/src/components/dashboard/StoreReleaseValidationModal.vue
@@ -363,16 +363,15 @@ function closeModal() {
   setupSuccess.value = ''
 }
 
-function dismissPrompt() {
-  closeModal()
-  hasDismissedPrompt.value = true
-}
-
 function openModal() {
   isOpen.value = true
   void queueReminder()
 }
 
+defineExpose({
+  openModal,
+})
+
 function confirmPublished() {
   hasConfirmedPublished.value = true
   void loadChannels()
@@ -514,65 +513,9 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div
-    v-if="shouldPrompt && !isOpen"
-    data-test="store-release-validation-alert"
-    class="mb-4 rounded-lg border border-slate-200 bg-white shadow-sm dark:border-slate-800 dark:bg-slate-950"
-  >
-    <div class="flex flex-col gap-3 border-l-4 border-azure-500 px-3 py-3 sm:flex-row sm:items-center sm:justify-between sm:px-4">
-      <div class="flex min-w-0 gap-2.5">
-        <span class="flex h-8 w-8 shrink-0 items-center justify-center rounded-md bg-slate-100 text-slate-700 dark:bg-slate-900 dark:text-slate-200">
-          <IconStore class="h-4 w-4" />
-        </span>
-
-        <div class="min-w-0">
-          <p class="text-sm font-semibold leading-5 text-slate-950 dark:text-white">
-            {{ t('store-release-validation-badge') }}
-          </p>
-          <p class="mt-0.5 max-w-3xl text-sm leading-5 text-slate-600 dark:text-slate-300">
-            {{ body }}
-          </p>
-          <div class="mt-1 flex flex-wrap gap-x-3 gap-y-0.5 text-xs leading-4 text-slate-500 dark:text-slate-400">
-            <span class="inline-flex items-center gap-1.5">
-              <IconCheck class="h-3.5 w-3.5 text-emerald-600 dark:text-emerald-300" />
-              {{ t('store-release-validation-signal-live-update') }}
-            </span>
-            <span class="inline-flex items-center gap-1.5">
-              <IconSmartphone class="h-3.5 w-3.5 text-slate-500 dark:text-slate-400" />
-              {{ storeSignal }}
-            </span>
-            <span class="inline-flex items-center gap-1.5">
-              <IconBell class="h-3.5 w-3.5 text-amber-600 dark:text-amber-300" />
-              {{ t('store-release-validation-signal-reminder') }}
-            </span>
-          </div>
-        </div>
-      </div>
-
-      <div class="flex shrink-0 flex-col-reverse gap-2 sm:flex-row sm:items-center">
-        <button
-          type="button"
-          class="d-btn d-btn-ghost d-btn-sm h-9 min-h-9 px-3 text-slate-600 dark:text-slate-300"
-          data-test="store-release-validation-dismiss"
-          @click="dismissPrompt"
-        >
-          {{ t('store-release-validation-dismiss') }}
-        </button>
-        <button
-          type="button"
-          class="d-btn d-btn-primary d-btn-sm h-9 min-h-9 px-3"
-          data-test="store-release-validation-open"
-          @click="openModal"
-        >
-          {{ t('store-release-validation-open') }}
-          <IconArrowRight class="h-4 w-4" />
-        </button>
-      </div>
-    </div>
-  </div>
   <Teleport to="body">
     <div
-      v-if="shouldPrompt && isOpen"
+      v-if="isOpen"
       class="d-modal d-modal-open"
       role="dialog"
       aria-modal="true"
diff --git a/src/composables/useAppPage.ts b/src/composables/useAppPage.ts
index 008ebb418e..689df43c97 100644
--- a/src/composables/useAppPage.ts
+++ b/src/composables/useAppPage.ts
@@ -5,7 +5,7 @@ import { useSupabase } from '~/services/supabase'
 import { useDisplayStore } from '~/stores/display'
 
 interface UseAppPageOptions {
-  routeName: '/app/[app].settings' | '/app/[app].settings.access' | '/app/[app].observe.logs'
+  routeName: '/app/[app].settings' | '/app/[app].settings.access' | '/app/[app].observe.logs' | '/app/[app].getting-started'
   navTitle?: string
 }
 
diff --git a/src/pages/admin/dashboard/organizations.vue b/src/pages/admin/dashboard/organizations.vue
index 17ec705c87..9db1c516bd 100644
--- a/src/pages/admin/dashboard/organizations.vue
+++ b/src/pages/admin/dashboard/organizations.vue
@@ -39,6 +39,7 @@ interface OrganizationInsight {
   last_build_at: string | null
   paid_at: string | null
   registered_at: string
+  distribution_stage: string | null
 }
 
 interface OrganizationInsightsResponse {
@@ -89,6 +90,22 @@ function formatDateOrNever(value: string | null) {
   return formatLocalDateTime(value) || t('never')
 }
 
+const DISTRIBUTION_STAGE_LABEL_KEYS: Record<string, string> = {
+  no_device: 'distribution-stage-no-device',
+  local_only: 'distribution-stage-local-only',
+  native_unknown: 'distribution-stage-native-unknown',
+  play_unknown: 'distribution-stage-play-unknown',
+  testflight: 'distribution-stage-testflight',
+  store_live: 'distribution-stage-store-live',
+}
+
+function formatDistributionStage(stage: string | null) {
+  if (!stage)
+    return t('unknown')
+  const key = DISTRIBUTION_STAGE_LABEL_KEYS[stage]
+  return key ? t(key) : t('unknown')
+}
+
 function getOrganizationAttentionLabel(item: OrganizationInsight) {
   const failRate = Number(item.fail_rate || 0)
   const failedUpdateCount = Number(item.failed_update_count || 0)
@@ -282,6 +299,13 @@ const organizationColumns = computed<TableColumn[]>(() => [
     sortable: false,
     displayFunction: (item: OrganizationInsight) => formatDateOrNever(item.last_upload_at),
   },
+  {
+    label: t('distribution-stage'),
+    key: 'distribution_stage',
+    mobile: true,
+    sortable: false,
+    displayFunction: (item: OrganizationInsight) => formatDistributionStage(item.distribution_stage),
+  },
   {
     label: t('last-build'),
     key: 'last_build_at',
diff --git a/src/pages/admin/dashboard/users.vue b/src/pages/admin/dashboard/users.vue
index 7da6351ebf..1e24fbc41e 100644
--- a/src/pages/admin/dashboard/users.vue
+++ b/src/pages/admin/dashboard/users.vue
@@ -43,6 +43,8 @@ interface OnboardingFunnelData {
   orgs_subscribed: number
   orgs_with_production_device: number
   orgs_with_update_download: number
+  orgs_with_testflight: number
+  orgs_with_store_live: number
   activation_telemetry_available: boolean
   total_invite_registrations: number
   total_org_joins_invite_register: number
@@ -54,6 +56,8 @@ interface OnboardingFunnelData {
   subscription_conversion_rate: number
   production_device_conversion_rate: number
   update_download_conversion_rate: number
+  testflight_conversion_rate: number
+  store_live_conversion_rate: number
   trend: Array<{
     date: string
     new_registrations: number
@@ -64,6 +68,8 @@ interface OnboardingFunnelData {
     orgs_subscribed: number
     orgs_with_production_device: number
     orgs_with_update_download: number
+    orgs_with_testflight: number
+    orgs_with_store_live: number
   }>
   invite_trend: Array<{
     date: string
@@ -838,6 +844,8 @@ const onboardingFunnelRates = computed(() => {
       subscribed: 0,
       productionDevice: 0,
       updateDownload: 0,
+      testflight: 0,
+      storeLive: 0,
     }
   }
 
@@ -849,6 +857,8 @@ const onboardingFunnelRates = computed(() => {
   const orgsSubscribed = Number(onboardingFunnelData.value.orgs_subscribed) || 0
   const orgsWithProductionDevice = Number(onboardingFunnelData.value.orgs_with_production_device) || 0
   const orgsWithUpdateDownload = Number(onboardingFunnelData.value.orgs_with_update_download) || 0
+  const orgsWithTestflight = Number(onboardingFunnelData.value.orgs_with_testflight) || 0
+  const orgsWithStoreLive = Number(onboardingFunnelData.value.orgs_with_store_live) || 0
 
   return {
     org: totalRegistrations > 0 ? (totalOrgs / totalRegistrations) * 100 : 0,
@@ -858,6 +868,8 @@ const onboardingFunnelRates = computed(() => {
     subscribed: orgsWithBundle > 0 ? (orgsSubscribed / orgsWithBundle) * 100 : 0,
     productionDevice: orgsWithBundle > 0 ? (orgsWithProductionDevice / orgsWithBundle) * 100 : 0,
     updateDownload: orgsWithProductionDevice > 0 ? (orgsWithUpdateDownload / orgsWithProductionDevice) * 100 : 0,
+    testflight: orgsWithBundle > 0 ? (orgsWithTestflight / orgsWithBundle) * 100 : 0,
+    storeLive: orgsWithBundle > 0 ? (orgsWithStoreLive / orgsWithBundle) * 100 : 0,
   }
 })
 
@@ -888,6 +900,18 @@ const onboardingFunnelConversionSummaries = computed(() => {
       label: t('channel-to-bundle'),
       colorClass: 'text-emerald-500',
     },
+    {
+      key: 'testflight',
+      value: rates.testflight,
+      label: t('bundle-to-testflight'),
+      colorClass: 'text-cyan-500',
+    },
+    {
+      key: 'storeLive',
+      value: rates.storeLive,
+      label: t('bundle-to-store-live'),
+      colorClass: 'text-teal-500',
+    },
   ]
 
   if (onboardingFunnelData.value?.activation_telemetry_available) {
@@ -920,6 +944,8 @@ const onboardingFunnelConversionSummaries = computed(() => {
 const onboardingFunnelConversionGridClass = computed(() => {
   // Keep one row on large screens so rates follow the funnel columns.
   const count = onboardingFunnelConversionSummaries.value.length
+  if (count >= 9)
+    return 'grid-cols-2 sm:grid-cols-3 lg:grid-cols-5 xl:grid-cols-9'
   if (count >= 7)
     return 'grid-cols-2 sm:grid-cols-3 lg:grid-cols-7'
   if (count >= 6)
@@ -965,6 +991,18 @@ const onboardingFunnelStages = computed(() => {
       percentage: rates.bundle,
       color: '#10b981', // green
     },
+    {
+      label: t('reached-testflight'),
+      value: Number(data.orgs_with_testflight) || 0,
+      percentage: rates.testflight,
+      color: '#06b6d4', // cyan
+    },
+    {
+      label: t('reached-app-store-live'),
+      value: Number(data.orgs_with_store_live) || 0,
+      percentage: rates.storeLive,
+      color: '#0d9488', // teal
+    },
     ...(data.activation_telemetry_available
       ? [
           {
@@ -1036,6 +1074,22 @@ const onboardingFunnelTrendSeries = computed(() => {
       })),
       color: '#10b981', // green
     },
+    {
+      label: t('reached-testflight-within-7-days'),
+      data: trend.map(item => ({
+        date: item.date,
+        value: item.orgs_with_testflight,
+      })),
+      color: '#06b6d4', // cyan
+    },
+    {
+      label: t('reached-app-store-live-within-7-days'),
+      data: trend.map(item => ({
+        date: item.date,
+        value: item.orgs_with_store_live,
+      })),
+      color: '#0d9488', // teal
+    },
     ...(onboardingFunnelData.value.activation_telemetry_available
       ? [
           {
diff --git a/src/pages/app/[app].getting-started.vue b/src/pages/app/[app].getting-started.vue
new file mode 100644
index 0000000000..36f3aa6fd7
--- /dev/null
+++ b/src/pages/app/[app].getting-started.vue
@@ -0,0 +1,273 @@
+<script setup lang="ts">
+import type { GettingStartedStep } from '~/utils/appOnboardingProgress'
+import { computed, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useRouter } from 'vue-router'
+import IconCheck from '~icons/lucide/check'
+import AppPageFrame from '~/components/dashboard/AppPageFrame.vue'
+import { useAppPage } from '~/composables/useAppPage'
+import { useSupabase } from '~/services/supabase'
+import { useOrganizationStore } from '~/stores/organization'
+import {
+  buildGettingStartedSteps,
+  gettingStartedProgress,
+  parseAppOnboardingLedger,
+} from '~/utils/appOnboardingProgress'
+
+const { t } = useI18n()
+const router = useRouter()
+const supabase = useSupabase()
+const organizationStore = useOrganizationStore()
+const { id, app, isLoading } = useAppPage({
+  routeName: '/app/[app].getting-started',
+  navTitle: t('getting-started'),
+})
+
+const storeModal = useTemplateRef<{ openModal: () => void }>('storeModal')
+const builderModalOpen = ref(false)
+const builderDone = ref(false)
+let builderReqToken = 0
+
+const orgApp = computed(() => id.value ? organizationStore.getAppByAppId(id.value) : undefined)
+const appName = computed(() => app.value?.name || orgApp.value?.name || id.value)
+const appIcon = computed(() => orgApp.value?.icon_url || '')
+const iconLoading = computed(() => orgApp.value?.icon_url_loading === true)
+
+const ledger = computed(() => parseAppOnboardingLedger(app.value?.onboarding))
+const steps = computed(() => buildGettingStartedSteps(ledger.value, { builderDone: builderDone.value }))
+const progress = computed(() => gettingStartedProgress(steps.value))
+const stepGroups = computed(() => {
+  const essential = steps.value.filter(step => step.group === 'essential')
+  const grow = steps.value.filter(step => step.group === 'grow')
+  return [
+    { id: 'essential', titleKey: 'getting-started-essential', steps: essential, doneCount: essential.filter(step => step.done).length },
+    { id: 'grow', titleKey: 'getting-started-grow', steps: grow, doneCount: grow.filter(step => step.done).length },
+  ]
+})
+const allDone = computed(() => progress.value.done === progress.value.total && progress.value.total > 0)
+
+function acronym(name: string) {
+  const trimmed = name.trim()
+  if (!trimmed)
+    return '?'
+  const parts = trimmed.split(/\s+/)
+  const first = parts[0]?.[0] ?? ''
+  const second = parts.length > 1 ? (parts[1]?.[0] ?? '') : (parts[0]?.[1] ?? '')
+  return (first + second).toUpperCase()
+}
+
+async function checkBuilderDone(appId: string) {
+  const token = ++builderReqToken
+  builderDone.value = false
+  try {
+    await organizationStore.awaitInitialLoad()
+    const orgId = organizationStore.getOrgByAppId(appId)?.gid
+    if (!orgId)
+      return
+    const { count, error } = await supabase
+      .from('build_requests')
+      .select('id', { count: 'exact', head: true })
+      .eq('owner_org', orgId)
+      .eq('app_id', appId)
+      .in('status', ['succeeded', 'released'])
+    if (token !== builderReqToken || error)
+      return
+    builderDone.value = (count ?? 0) > 0
+  }
+  catch (error) {
+    console.error('Cannot load getting started builder status', error)
+  }
+}
+
+function runStep(step: GettingStartedStep) {
+  if (step.done)
+    return
+  if (step.id === 'cli_install') {
+    if (app.value?.need_onboarding)
+      void router.push({ path: '/app/new', query: { resume: id.value } })
+    else
+      void router.push(`/app/${encodeURIComponent(id.value)}/devices`)
+    return
+  }
+  if (step.id === 'live_update') {
+    void router.push(`/app/${encodeURIComponent(id.value)}/bundles`)
+    return
+  }
+  if (step.id === 'store_release') {
+    storeModal.value?.openModal()
+    return
+  }
+  builderModalOpen.value = true
+}
+
+watch(() => id.value, async (appId) => {
+  if (!appId)
+    return
+  await organizationStore.awaitInitialLoad()
+  const appOrganization = organizationStore.getOrgByAppId(appId)
+  if (appOrganization && organizationStore.currentOrganization?.gid !== appOrganization.gid)
+    organizationStore.setCurrentOrganization(appOrganization.gid)
+  void checkBuilderDone(appId)
+}, { immediate: true })
+</script>
+
+<template>
+  <AppPageFrame :found="!!app" :loading="isLoading">
+    <div v-if="app" class="mx-auto max-w-3xl px-4 py-6 sm:px-0" data-test="getting-started-page">
+      <div
+        v-if="allDone"
+        class="mb-6 flex items-start gap-3 rounded-lg border border-emerald-200 bg-emerald-50 px-4 py-3 dark:border-emerald-800 dark:bg-emerald-950/40"
+        role="status"
+      >
+        <span class="mt-0.5 flex size-6 shrink-0 items-center justify-center rounded-full bg-emerald-600 text-white">
+          <IconCheck class="size-3.5" />
+        </span>
+        <div>
+          <p class="font-semibold text-emerald-900 dark:text-emerald-100">
+            {{ t('getting-started-complete') }}
+          </p>
+          <p class="text-sm text-emerald-800 dark:text-emerald-200">
+            {{ t('getting-started-complete-desc') }}
+          </p>
+        </div>
+      </div>
+
+      <div class="flex items-center gap-3">
+        <img
+          v-if="appIcon"
+          :src="appIcon"
+          :alt="`${appName} icon`"
+          class="size-12 rounded-lg object-cover d-mask d-mask-squircle"
+          width="48"
+          height="48"
+        >
+        <span
+          v-else-if="iconLoading"
+          class="flex size-12 items-center justify-center rounded-lg bg-slate-200 dark:bg-slate-800 d-mask d-mask-squircle"
+        >
+          <span class="size-5 rounded-full border-2 border-azure-500 border-t-transparent animate-spin" />
+          <span class="sr-only">{{ t('loading') }}</span>
+        </span>
+        <span
+          v-else
+          class="flex size-12 items-center justify-center rounded-lg bg-slate-200 text-lg font-semibold text-slate-700 dark:bg-slate-800 dark:text-slate-200 d-mask d-mask-squircle"
+          aria-hidden="true"
+        >
+          {{ acronym(appName) }}
+        </span>
+        <div class="min-w-0">
+          <p class="truncate text-lg font-semibold text-slate-950 dark:text-white">
+            {{ appName }}
+          </p>
+          <p class="truncate font-mono text-sm text-slate-500 dark:text-slate-400">
+            {{ id }}
+          </p>
+        </div>
+      </div>
+
+      <div class="mt-6 flex items-end justify-between gap-4">
+        <div>
+          <h1 class="text-2xl font-semibold text-slate-950 dark:text-white">
+            {{ t('getting-started') }}
+          </h1>
+          <p class="mt-1 text-sm leading-6 text-slate-600 dark:text-slate-300">
+            {{ t('getting-started-description') }}
+          </p>
+        </div>
+        <p class="shrink-0 tabular-nums text-sm font-medium text-slate-500 dark:text-slate-400">
+          {{ t('getting-started-count', { done: progress.done, total: progress.total }) }}
+        </p>
+      </div>
+
+      <div class="mt-4">
+        <div class="mb-1 flex justify-end">
+          <span class="tabular-nums text-xs font-semibold text-azure-700 dark:text-azure-300">
+            {{ t('getting-started-percent', { percent: progress.percent }) }}
+          </span>
+        </div>
+        <div
+          class="h-2 overflow-hidden rounded-full bg-slate-200 dark:bg-slate-800"
+          role="progressbar"
+          :aria-valuenow="progress.percent"
+          aria-valuemin="0"
+          aria-valuemax="100"
+          :aria-label="t('getting-started-count', { done: progress.done, total: progress.total })"
+        >
+          <div
+            class="h-full rounded-full bg-azure-500 transition-transform duration-200 ease-out motion-reduce:transition-none"
+            :style="{ transform: `scaleX(${progress.percent / 100})`, transformOrigin: 'left center' }"
+          />
+        </div>
+      </div>
+
+      <section
+        v-for="(group, index) in stepGroups"
+        :key="group.id"
+        :class="index === 0 ? 'mt-8' : 'mt-6'"
+      >
+        <details class="group" open>
+          <summary class="flex min-h-11 cursor-pointer list-none items-center justify-between gap-3 rounded-lg py-2 text-sm font-semibold uppercase tracking-wide text-slate-500 marker:content-none focus:outline-none focus:ring-2 focus:ring-azure-500 dark:text-slate-400 [&::-webkit-details-marker]:hidden">
+            <span class="flex items-center gap-2">
+              <IconCheck
+                v-if="group.doneCount === group.steps.length"
+                class="size-4 text-emerald-600 dark:text-emerald-300"
+              />
+              {{ t(group.titleKey) }}
+              {{ group.doneCount }}/{{ group.steps.length }}
+            </span>
+          </summary>
+          <ul class="divide-y divide-slate-200 rounded-lg border border-slate-200 bg-white shadow-sm dark:divide-white/10 dark:border-white/10 dark:bg-slate-800 dark:shadow-none dark:inset-ring dark:inset-ring-white/5">
+            <li
+              v-for="step in group.steps"
+              :key="step.id"
+              class="flex items-center gap-3 px-4 py-3"
+              :data-test="`getting-started-step-${step.id}`"
+            >
+              <span
+                class="flex size-6 shrink-0 items-center justify-center rounded-full"
+                :class="step.done ? 'bg-emerald-600 text-white' : 'border-2 border-slate-300 dark:border-slate-600'"
+                :aria-hidden="true"
+              >
+                <IconCheck v-if="step.done" class="size-3.5" />
+              </span>
+              <div class="min-w-0 flex-1">
+                <p class="font-semibold text-slate-950 dark:text-white">
+                  {{ t(step.titleKey) }}
+                </p>
+                <p class="text-sm leading-5 text-slate-500 dark:text-slate-400">
+                  {{ t(step.descKey) }}
+                </p>
+              </div>
+              <span
+                v-if="step.done"
+                class="shrink-0 text-sm font-medium text-slate-400 dark:text-slate-500"
+              >
+                {{ t('getting-started-done') }}
+              </span>
+              <button
+                v-else
+                type="button"
+                class="d-btn d-btn-ghost d-btn-sm h-11 min-h-11 shrink-0 px-3 text-azure-700 dark:text-azure-300"
+                data-test="getting-started-step-action"
+                @click="runStep(step)"
+              >
+                {{ t(step.actionKey) }}
+              </button>
+            </li>
+          </ul>
+        </details>
+      </section>
+    </div>
+
+    <StoreReleaseValidationModal
+      v-if="id"
+      ref="storeModal"
+      :app-id="id"
+    />
+    <BuilderPresentationModal
+      :open="builderModalOpen"
+      :app-id="id"
+      @close="builderModalOpen = false"
+    />
+  </AppPageFrame>
+</template>
diff --git a/src/pages/app/[app].vue b/src/pages/app/[app].vue
index 0f022d7898..1a4613543e 100644
--- a/src/pages/app/[app].vue
+++ b/src/pages/app/[app].vue
@@ -10,14 +10,12 @@ import DeploymentBanner from '~/components/dashboard/DeploymentBanner.vue'
 import DeploymentStatsCard from '~/components/dashboard/DeploymentStatsCard.vue'
 import DevicesStats from '~/components/dashboard/DevicesStats.vue'
 import ReleaseBanner from '~/components/dashboard/ReleaseBanner.vue'
-import StoreReleaseValidationModal from '~/components/dashboard/StoreReleaseValidationModal.vue'
 import UpdateStatsCard from '~/components/dashboard/UpdateStatsCard.vue'
 import { getCapgoVersion, useSupabase } from '~/services/supabase'
 import { useDashboardAppsStore } from '~/stores/dashboardApps'
 import { useDisplayStore } from '~/stores/display'
 import { useMainStore } from '~/stores/main'
-import { isPendingOrganizationInvite, useOrganizationStore } from '~/stores/organization'
-import { shouldShowBuilderPromo } from '~/utils/builderPromoVisibility'
+import { useOrganizationStore } from '~/stores/organization'
 
 const id = ref('')
 const route = useRoute('/app/[app]')
@@ -34,7 +32,6 @@ const isLoading = ref(false)
 const supabase = useSupabase()
 const displayStore = useDisplayStore()
 const app = ref<Database['public']['Tables']['apps']['Row']>()
-const appCount = ref<number | null>(null)
 const usageComponent = ref()
 const appNotFound = ref(false)
 const appOrganization = computed(() => {
@@ -42,18 +39,6 @@ const appOrganization = computed(() => {
     return undefined
   return organizationStore.getOrgByAppId(id.value) ?? organizationStore.currentOrganization
 })
-const isPendingOnboarding = computed(() => app.value?.need_onboarding === true)
-const selectableOrganizationCount = computed(() => organizationStore.organizations.filter(org => !isPendingOrganizationInvite(org)).length)
-const showBuilderPromo = computed(() => {
-  if (appCount.value === null)
-    return false
-
-  return shouldShowBuilderPromo({
-    organizationCount: selectableOrganizationCount.value,
-    appCount: appCount.value,
-    appNeedsOnboarding: isPendingOnboarding.value,
-  })
-})
 
 // Check if user lacks security compliance (2FA or password)
 const lacksSecurityAccess = computed(() => {
@@ -65,7 +50,6 @@ const lacksSecurityAccess = computed(() => {
 
 async function loadAppInfo() {
   app.value = undefined
-  appCount.value = null
   try {
     await organizationStore.awaitInitialLoad()
     const { data: dataApp, error } = await supabase
@@ -89,7 +73,6 @@ async function loadAppInfo() {
       devicesCount,
       bundlesCount,
       channelsCount,
-      ownerAppCount,
     ] = await Promise.all([
       getCapgoVersion(appId, dataApp.last_version),
       main.getTotalStatsByApp(appId, subscriptionStart),
@@ -105,18 +88,12 @@ async function loadAppInfo() {
         .select('*', { count: 'exact', head: true })
         .eq('app_id', appId)
         .then(({ count }) => count ?? 0),
-      supabase
-        .from('apps')
-        .select('app_id', { count: 'exact', head: true })
-        .eq('owner_org', dataApp.owner_org)
-        .then(({ count, error: appCountError }) => appCountError ? null : count ?? 0),
     ])
 
     if (id.value !== appId)
       return
 
     app.value = dataApp
-    appCount.value = ownerAppCount
     capgoVersion.value = capgoVersionResult
     updatesNb.value = updatesCount
     devicesNb.value = devicesCount
@@ -167,14 +144,10 @@ watchEffect(async () => {
 
         <!-- Content - blurred when app not found -->
         <div :class="{ 'blur-sm pointer-events-none select-none': appNotFound }">
-          <StoreReleaseValidationModal v-if="!appNotFound && !isLoading && app && !isPendingOnboarding" :app-id="id" />
           <DeploymentBanner v-if="!appNotFound" :app-id="id" @deployed="refreshData" />
           <ReleaseBanner v-if="!appNotFound" :app-id="id" />
           <CompatibilityBanner v-if="!appNotFound" :app-id="id" />
 
-          <!-- Capgo Builder promo banner (only for valid apps with no native build yet) -->
-          <BuilderPromoBanner v-if="!appNotFound && app && showBuilderPromo" :app-id="id" />
-
           <Usage
             v-if="!lacksSecurityAccess"
             ref="usageComponent"
diff --git a/src/pages/apps.vue b/src/pages/apps.vue
index b6556c47fc..000b0c74d8 100644
--- a/src/pages/apps.vue
+++ b/src/pages/apps.vue
@@ -42,6 +42,7 @@ function normalizeAppRow(app: AppIconSource): AppRow {
   return {
     ...app,
     created_from_onboarding: 'created_from_onboarding' in app ? app.created_from_onboarding : false,
+    onboarding: 'onboarding' in app ? app.onboarding : {},
     onboarding_completed_at: 'onboarding_completed_at' in app ? app.onboarding_completed_at : null,
     rollout_channel_count: 'rollout_channel_count' in app ? app.rollout_channel_count : 0,
     rollout_paused_version_names: 'rollout_paused_version_names' in app ? app.rollout_paused_version_names : [],
diff --git a/src/route-map.d.ts b/src/route-map.d.ts
index 75b3b11cf9..a3d63ad3ed 100644
--- a/src/route-map.d.ts
+++ b/src/route-map.d.ts
@@ -290,6 +290,13 @@ declare module 'vue-router/auto-routes' {
       { app: ParamValue<false> },
       | never
     >,
+    '/app/[app].getting-started': RouteRecordInfo<
+      '/app/[app].getting-started',
+      '/app/:app/getting-started',
+      { app: ParamValue<true> },
+      { app: ParamValue<false> },
+      | never
+    >,
     '/app/[app].notifications': RouteRecordInfo<
       '/app/[app].notifications',
       '/app/:app/notifications',
@@ -969,6 +976,14 @@ declare module 'vue-router/auto-routes' {
       pathParamNames:
         | 'app'
     }
+    'src/pages/app/[app].getting-started.vue': {
+      routes:
+        | '/app/[app].getting-started'
+      views:
+        | never
+      pathParamNames:
+        | 'app'
+    }
     'src/pages/app/[app].notifications.vue': {
       routes:
         | '/app/[app].notifications'
diff --git a/src/stores/display.ts b/src/stores/display.ts
index 4536c62337..2a39a3fea7 100644
--- a/src/stores/display.ts
+++ b/src/stores/display.ts
@@ -139,6 +139,12 @@ export const useDisplayStore = defineStore('display', () => {
 
     const breadcrumbs: BreadcrumbItem[] = []
 
+    // Getting Started is not an in-app section — no app tabs, no app crumbs.
+    if (splitPath[0] === 'app' && splitPath[2] === 'getting-started') {
+      pathTitle.value = []
+      return
+    }
+
     // App flow: Apps / <AppName> / <Section>
     if (splitPath[0] === 'app' && splitPath[1]) {
       const appId = splitPath[1]
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index b2f405a3ab..85f7a01f29 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -39,6 +39,7 @@ export interface OrganizationApp {
   icon_url: string | null
   icon_storage_path?: string | null
   icon_url_loading?: boolean
+  onboarding?: Database['public']['Tables']['apps']['Row']['onboarding']
 }
 export type OrganizationRole
   = 'owner'
@@ -269,7 +270,14 @@ export const useOrganizationStore = defineStore('organization', () => {
     }
   }
 
-  const appWithImmediateIcon = (app: { app_id: string, name: string | null, owner_org: string, need_onboarding: boolean, icon_url: string | null }): OrganizationApp => {
+  const appWithImmediateIcon = (app: {
+    app_id: string
+    name: string | null
+    owner_org: string
+    need_onboarding: boolean
+    icon_url: string | null
+    onboarding?: OrganizationApp['onboarding']
+  }): OrganizationApp => {
     const { normalized, shouldSign } = resolveImagePath(app.icon_url)
     return {
       app_id: app.app_id,
@@ -279,6 +287,7 @@ export const useOrganizationStore = defineStore('organization', () => {
       icon_url: shouldSign ? '' : normalized || null,
       icon_storage_path: normalized || null,
       icon_url_loading: shouldSign,
+      onboarding: app.onboarding ?? {},
     }
   }
 
@@ -393,7 +402,7 @@ export const useOrganizationStore = defineStore('organization', () => {
     const appIconLoadRun = ++organizationAppIconLoadRun
     const { error, data: allAppsByOwner } = await supabase
       .from('apps')
-      .select('app_id, name, owner_org, need_onboarding, icon_url')
+      .select('app_id, name, owner_org, need_onboarding, icon_url, onboarding')
       .in('owner_org', orgIds)
 
     if (error) {
@@ -454,6 +463,60 @@ export const useOrganizationStore = defineStore('organization', () => {
     return _initialLoadPromise.value.promise
   }
 
+  const appOnboardingWriteGen = new Map<string, number>()
+
+  const writeAppOnboarding = (appId: string, onboarding: OrganizationApp['onboarding']) => {
+    const existing = _appsByAppId.value.get(appId)
+    if (!existing)
+      return
+
+    const next = { ...existing, onboarding }
+    const nextByAppId = new Map(_appsByAppId.value)
+    nextByAppId.set(appId, next)
+    _appsByAppId.value = nextByAppId
+
+    const orgApps = _appsByOrgId.value.get(existing.owner_org)
+    if (!orgApps)
+      return
+    const nextByOrgId = new Map(_appsByOrgId.value)
+    nextByOrgId.set(existing.owner_org, orgApps.map(app => app.app_id === appId ? next : app))
+    _appsByOrgId.value = nextByOrgId
+  }
+
+  const updateAppOnboarding = (appId: string, onboarding: OrganizationApp['onboarding'] | null | undefined) => {
+    if (!_appsByAppId.value.get(appId) || onboarding == null)
+      return
+    appOnboardingWriteGen.set(appId, (appOnboardingWriteGen.get(appId) ?? 0) + 1)
+    writeAppOnboarding(appId, onboarding)
+  }
+
+  let appsOnboardingRefreshGen = 0
+
+  const refreshAppsOnboarding = async (orgId?: string) => {
+    const orgIds = orgId ? [orgId] : Array.from(_appsByOrgId.value.keys())
+    if (orgIds.length === 0)
+      return
+
+    const refreshGen = ++appsOnboardingRefreshGen
+    const writeGenSnapshot = new Map(appOnboardingWriteGen)
+    const { data, error } = await supabase
+      .from('apps')
+      .select('app_id, onboarding')
+      .in('owner_org', orgIds)
+
+    if (error) {
+      console.error('Cannot refresh app onboarding', error)
+      return
+    }
+    if (refreshGen !== appsOnboardingRefreshGen)
+      return
+    for (const row of data ?? []) {
+      if ((appOnboardingWriteGen.get(row.app_id) ?? 0) !== (writeGenSnapshot.get(row.app_id) ?? 0))
+        continue
+      writeAppOnboarding(row.app_id, row.onboarding)
+    }
+  }
+
   const getCurrentRoleForApp = (appId: string) => {
     if (_organizationsByAppId.value.size < 1)
       throw new Error('Organizations by app_id map is empty')
@@ -766,6 +829,8 @@ export const useOrganizationStore = defineStore('organization', () => {
     getAppByAppId,
     getAppsByOrgId,
     awaitInitialLoad,
+    updateAppOnboarding,
+    refreshAppsOnboarding,
     deleteOrganization,
     canDeleteOrganization,
     checkPasswordPolicyImpact,
diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index e68825a23a..9e7f86f473 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -333,6 +333,7 @@ export type Database = {
           manifest_bundle_count: number
           name: string | null
           need_onboarding: boolean
+          onboarding: Json
           onboarding_completed_at: string | null
           owner_org: string
           retention: number
@@ -365,6 +366,7 @@ export type Database = {
           manifest_bundle_count?: number
           name?: string | null
           need_onboarding?: boolean
+          onboarding?: Json
           onboarding_completed_at?: string | null
           owner_org: string
           retention?: number
@@ -397,6 +399,7 @@ export type Database = {
           manifest_bundle_count?: number
           name?: string | null
           need_onboarding?: boolean
+          onboarding?: Json
           onboarding_completed_at?: string | null
           owner_org?: string
           retention?: number
@@ -4137,6 +4140,7 @@ export type Database = {
           manifest_bundle_count: number
           name: string | null
           need_onboarding: boolean
+          onboarding: Json
           onboarding_completed_at: string | null
           owner_org: string
           retention: number
@@ -4870,6 +4874,10 @@ export type Database = {
       }
       long_canceled_org_ids: { Args: never; Returns: string[] }
       mark_app_stats_refreshed: { Args: { p_app_id: string }; Returns: string }
+      mark_onboarding_feature_started: {
+        Args: { p_app_id: string, p_feature_key: string }
+        Returns: Json
+      }
       mass_edit_queue_messages_cf_ids: {
         Args: {
           updates: Database["public"]["CompositeTypes"]["message_update"][]
diff --git a/src/utils/appOnboardingProgress.ts b/src/utils/appOnboardingProgress.ts
new file mode 100644
index 0000000000..ef471e902d
--- /dev/null
+++ b/src/utils/appOnboardingProgress.ts
@@ -0,0 +1,269 @@
+export const APP_ONBOARDING_FEATURES = ['cli_install', 'ota', 'builder'] as const
+export type AppOnboardingFeatureKey = typeof APP_ONBOARDING_FEATURES[number]
+
+export const APP_ONBOARDING_STAGES = [
+  'no_device',
+  'local_only',
+  'native_unknown',
+  'play_unknown',
+  'testflight',
+  'store_live',
+] as const
+export type AppOnboardingStage = typeof APP_ONBOARDING_STAGES[number]
+
+export interface AppOnboardingFeature {
+  started_at?: string | null
+  succeeded_at?: string | null
+  last_used_at?: string | null
+  retained_30d_at?: string | null
+  stage?: AppOnboardingStage | null
+}
+
+export interface AppOnboardingLedger {
+  refreshed_at?: string | null
+  features?: Partial<Record<string, AppOnboardingFeature>>
+}
+
+const STAGE_RANK = new Map<AppOnboardingStage, number>(
+  APP_ONBOARDING_STAGES.map((stage, index) => [stage, index]),
+)
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function asTimestamp(value: unknown): string | null {
+  return typeof value === 'string' && value.length > 0 ? value : null
+}
+
+export function parseAppOnboardingStage(value: unknown): AppOnboardingStage | null {
+  if (typeof value !== 'string')
+    return null
+  return (APP_ONBOARDING_STAGES as readonly string[]).includes(value)
+    ? value as AppOnboardingStage
+    : null
+}
+
+export function parseAppOnboardingFeature(value: unknown): AppOnboardingFeature {
+  if (!isRecord(value))
+    return {}
+
+  return {
+    started_at: asTimestamp(value.started_at),
+    succeeded_at: asTimestamp(value.succeeded_at),
+    last_used_at: asTimestamp(value.last_used_at),
+    retained_30d_at: asTimestamp(value.retained_30d_at),
+    stage: parseAppOnboardingStage(value.stage),
+  }
+}
+
+export function parseAppOnboardingLedger(value: unknown): AppOnboardingLedger {
+  if (!isRecord(value))
+    return {}
+
+  const featuresValue = value.features
+  const features: AppOnboardingLedger['features'] = {}
+  if (isRecord(featuresValue)) {
+    for (const [key, feature] of Object.entries(featuresValue))
+      features[key] = parseAppOnboardingFeature(feature)
+  }
+
+  return {
+    refreshed_at: asTimestamp(value.refreshed_at),
+    features,
+  }
+}
+
+export function getAppOnboardingFeature(
+  ledger: AppOnboardingLedger,
+  key: AppOnboardingFeatureKey,
+): AppOnboardingFeature {
+  return parseAppOnboardingLedger(ledger).features?.[key] ?? {}
+}
+
+export function rankAppOnboardingStage(stage: AppOnboardingStage | null | undefined): number {
+  if (!stage)
+    return -1
+  return STAGE_RANK.get(stage) ?? -1
+}
+
+export function highestAppOnboardingStage(
+  stages: Array<AppOnboardingStage | null | undefined>,
+): AppOnboardingStage | null {
+  let best: AppOnboardingStage | null = null
+  let bestRank = -1
+  for (const stage of stages) {
+    const rank = rankAppOnboardingStage(stage)
+    if (rank > bestRank) {
+      best = stage ?? null
+      bestRank = rank
+    }
+  }
+  return best
+}
+
+export function isFeatureRetained30d(feature: AppOnboardingFeature): boolean {
+  return Boolean(feature.retained_30d_at)
+}
+
+export function isFeatureUsedSince(feature: AppOnboardingFeature, sinceMs: number, now = Date.now()): boolean {
+  if (!feature.last_used_at)
+    return false
+  const usedAt = Date.parse(feature.last_used_at)
+  return Number.isFinite(usedAt) && usedAt >= now - sinceMs
+}
+
+export function nextOnboardingAction(ledger: AppOnboardingLedger): {
+  feature: AppOnboardingFeatureKey
+  stage: AppOnboardingStage | null
+} {
+  const cliInstall = ledger.features?.cli_install ?? {}
+  const ota = ledger.features?.ota ?? {}
+  const builder = ledger.features?.builder ?? {}
+  const stage = parseAppOnboardingStage(ota.stage) ?? (cliInstall.succeeded_at ? 'native_unknown' : 'no_device')
+
+  if (builder.started_at && !builder.succeeded_at)
+    return { feature: 'builder', stage }
+  if (!cliInstall.started_at)
+    return { feature: 'cli_install', stage }
+  if (!cliInstall.succeeded_at || stage === 'no_device' || stage === 'local_only')
+    return { feature: 'cli_install', stage }
+  if (!ota.started_at || !ota.succeeded_at)
+    return { feature: 'ota', stage }
+  if (stage === 'testflight' || stage === 'play_unknown' || stage === 'native_unknown')
+    return { feature: 'ota', stage }
+  return { feature: 'ota', stage }
+}
+
+export function shouldShowOnboardingNextStep(ledger: AppOnboardingLedger): boolean {
+  return nextOnboardingAction(ledger).stage !== 'store_live'
+}
+
+export const GETTING_STARTED_STEP_IDS = ['cli_install', 'live_update', 'store_release', 'builder'] as const
+export type GettingStartedStepId = typeof GETTING_STARTED_STEP_IDS[number]
+export type GettingStartedGroup = 'essential' | 'grow'
+
+export interface GettingStartedStep {
+  id: GettingStartedStepId
+  group: GettingStartedGroup
+  done: boolean
+  titleKey: string
+  descKey: string
+  actionKey: string
+}
+
+const GETTING_STARTED_STEP_DEFS: Array<Omit<GettingStartedStep, 'done'>> = [
+  {
+    id: 'cli_install',
+    group: 'essential',
+    titleKey: 'onboarding-next-cli-install',
+    descKey: 'onboarding-next-cli-install-desc',
+    actionKey: 'getting-started-action-setup',
+  },
+  {
+    id: 'live_update',
+    group: 'essential',
+    titleKey: 'getting-started-live-update',
+    descKey: 'getting-started-live-update-desc',
+    actionKey: 'getting-started-action-setup',
+  },
+  {
+    id: 'store_release',
+    group: 'essential',
+    titleKey: 'store-release-validation-badge',
+    descKey: 'onboarding-next-ota-store-desc',
+    actionKey: 'getting-started-action-validate',
+  },
+  {
+    id: 'builder',
+    group: 'grow',
+    titleKey: 'builder-promo-banner-title',
+    descKey: 'builder-promo-banner-subtitle',
+    actionKey: 'getting-started-action-explore',
+  },
+]
+
+function onboardingStage(ledger: AppOnboardingLedger): AppOnboardingStage | null {
+  const ota = ledger.features?.ota ?? {}
+  const cliInstall = ledger.features?.cli_install ?? {}
+  return parseAppOnboardingStage(ota.stage) ?? parseAppOnboardingStage(cliInstall.stage)
+}
+
+export function isGettingStartedStepDone(
+  ledger: AppOnboardingLedger,
+  id: GettingStartedStepId,
+  extras?: { builderDone?: boolean },
+): boolean {
+  const cliInstall = ledger.features?.cli_install ?? {}
+  const ota = ledger.features?.ota ?? {}
+  const builder = ledger.features?.builder ?? {}
+  const stage = onboardingStage(ledger)
+
+  if (id === 'cli_install') {
+    return Boolean(cliInstall.succeeded_at)
+      || rankAppOnboardingStage(stage) > rankAppOnboardingStage('local_only')
+  }
+  if (id === 'live_update')
+    return Boolean(ota.succeeded_at)
+  if (id === 'store_release')
+    return stage === 'store_live'
+  return extras?.builderDone === true || Boolean(builder.succeeded_at)
+}
+
+export function buildGettingStartedSteps(
+  ledger: AppOnboardingLedger,
+  extras?: { builderDone?: boolean },
+): GettingStartedStep[] {
+  return GETTING_STARTED_STEP_DEFS.map(def => ({
+    ...def,
+    done: isGettingStartedStepDone(ledger, def.id, extras),
+  }))
+}
+
+export function gettingStartedProgress(steps: GettingStartedStep[]): {
+  done: number
+  total: number
+  percent: number
+} {
+  const total = steps.length
+  const done = steps.filter(step => step.done).length
+  return {
+    done,
+    total,
+    percent: total === 0 ? 0 : Math.round((done / total) * 100),
+  }
+}
+
+export function shouldShowGettingStartedNav(ledger: AppOnboardingLedger): boolean {
+  return buildGettingStartedSteps(ledger)
+    .some(step => step.group === 'essential' && !step.done)
+}
+
+export function onboardingNextStepMessageKeys(ledger: AppOnboardingLedger): {
+  titleKey: string
+  descKey: string
+} {
+  const next = nextOnboardingAction(ledger)
+  if (next.feature === 'cli_install') {
+    return {
+      titleKey: 'onboarding-next-cli-install',
+      descKey: 'onboarding-next-cli-install-desc',
+    }
+  }
+  if (next.feature === 'builder') {
+    return {
+      titleKey: 'onboarding-next-builder',
+      descKey: 'onboarding-next-builder-desc',
+    }
+  }
+  if (next.stage === 'testflight' || next.stage === 'play_unknown' || next.stage === 'native_unknown') {
+    return {
+      titleKey: 'onboarding-next-ota-store',
+      descKey: 'onboarding-next-ota-store-desc',
+    }
+  }
+  return {
+    titleKey: 'onboarding-next-ota-device',
+    descKey: 'onboarding-next-ota-device-desc',
+  }
+}
diff --git a/src/utils/gettingStartedDismiss.ts b/src/utils/gettingStartedDismiss.ts
new file mode 100644
index 0000000000..e4be5fc27d
--- /dev/null
+++ b/src/utils/gettingStartedDismiss.ts
@@ -0,0 +1,60 @@
+const STORAGE_PREFIX = 'capgo.gettingStarted.dismissed'
+
+export function gettingStartedDismissedKey(userId: string, appId: string) {
+  return `${STORAGE_PREFIX}.${userId}.${appId}`
+}
+
+export function gettingStartedDismissedLegacyKey(userId: string) {
+  return `${STORAGE_PREFIX}.${userId}`
+}
+
+export function parseDismissedGettingStartedAppIds(raw: string | null): Set<string> {
+  if (!raw)
+    return new Set()
+
+  try {
+    const parsed = JSON.parse(raw) as unknown
+    if (!Array.isArray(parsed))
+      return new Set()
+    return new Set(parsed.filter((appId): appId is string => typeof appId === 'string' && appId.length > 0))
+  }
+  catch {
+    return new Set()
+  }
+}
+
+export function serializeDismissedGettingStartedAppIds(appIds: Iterable<string>) {
+  return JSON.stringify([...new Set(appIds)])
+}
+
+function readStorage(key: string): string | null {
+  try {
+    return localStorage.getItem(key)
+  }
+  catch {
+    return null
+  }
+}
+
+function writeStorage(key: string, value: string) {
+  try {
+    localStorage.setItem(key, value)
+  }
+  catch {
+    // Ignore blocked or full storage so sidebar render and dismiss clicks stay safe.
+  }
+}
+
+export function isGettingStartedDismissed(userId: string, appId: string) {
+  if (!userId || !appId || typeof localStorage === 'undefined')
+    return false
+  if (readStorage(gettingStartedDismissedKey(userId, appId)) === '1')
+    return true
+  return parseDismissedGettingStartedAppIds(readStorage(gettingStartedDismissedLegacyKey(userId))).has(appId)
+}
+
+export function dismissGettingStarted(userId: string, appId: string) {
+  if (!userId || !appId || typeof localStorage === 'undefined')
+    return
+  writeStorage(gettingStartedDismissedKey(userId, appId), '1')
+}
diff --git a/supabase/functions/_backend/plugin_runtime/utils/pg.ts b/supabase/functions/_backend/plugin_runtime/utils/pg.ts
index 1fe3e9ca73..cfaf45e880 100644
--- a/supabase/functions/_backend/plugin_runtime/utils/pg.ts
+++ b/supabase/functions/_backend/plugin_runtime/utils/pg.ts
@@ -2822,6 +2822,7 @@ export interface AdminOrganizationInsightRow {
   last_build_at: string | null
   paid_at: string | null
   registered_at: string
+  distribution_stage: string | null
 }
 
 export interface AdminOrganizationInsightsResult {
@@ -3028,6 +3029,32 @@ export async function getAdminOrganizationInsights(
         FROM build_logs bl
         INNER JOIN filtered_orgs filtered ON filtered.org_id = bl.org_id
         GROUP BY bl.org_id
+      ),
+      onboarding_stage_by_org AS (
+        SELECT
+          a.owner_org AS org_id,
+          CASE MAX(
+            CASE a.onboarding -> 'features' -> 'ota' ->> 'stage'
+              WHEN 'store_live' THEN 5
+              WHEN 'testflight' THEN 4
+              WHEN 'play_unknown' THEN 3
+              WHEN 'native_unknown' THEN 2
+              WHEN 'local_only' THEN 1
+              WHEN 'no_device' THEN 0
+              ELSE -1
+            END
+          )
+            WHEN 5 THEN 'store_live'
+            WHEN 4 THEN 'testflight'
+            WHEN 3 THEN 'play_unknown'
+            WHEN 2 THEN 'native_unknown'
+            WHEN 1 THEN 'local_only'
+            WHEN 0 THEN 'no_device'
+            ELSE NULL
+          END AS distribution_stage
+        FROM apps a
+        INNER JOIN filtered_orgs filtered ON filtered.org_id = a.owner_org
+        GROUP BY a.owner_org
       )
       SELECT
         filtered.org_id,
@@ -3048,7 +3075,8 @@ export async function getAdminOrganizationInsights(
         buo.last_upload_at,
         lb.last_build_at,
         filtered.paid_at,
-        filtered.registered_at
+        filtered.registered_at,
+        stage.distribution_stage
       FROM filtered_orgs filtered
       LEFT JOIN apps_by_org apps ON apps.org_id = filtered.org_id
       LEFT JOIN members_by_org members ON members.org_id = filtered.org_id
@@ -3056,6 +3084,7 @@ export async function getAdminOrganizationInsights(
       LEFT JOIN build_usage_by_org bu ON bu.org_id = filtered.org_id
       LEFT JOIN bundle_uploads_by_org buo ON buo.org_id = filtered.org_id
       LEFT JOIN last_builds_by_org lb ON lb.org_id = filtered.org_id
+      LEFT JOIN onboarding_stage_by_org stage ON stage.org_id = filtered.org_id
       ORDER BY
         filtered.needs_attention DESC,
         CASE
@@ -3111,6 +3140,7 @@ export async function getAdminOrganizationInsights(
       last_build_at: normalizeTimestamp(row.last_build_at),
       paid_at: normalizeTimestamp(row.paid_at),
       registered_at: normalizeTimestamp(row.registered_at) ?? '',
+      distribution_stage: row.distribution_stage ?? null,
     }))
 
     const total = Number((countResult.rows[0] as any)?.total) || 0
@@ -3492,6 +3522,8 @@ export interface AdminOnboardingFunnel {
   orgs_subscribed: number
   orgs_with_production_device: number
   orgs_with_update_download: number
+  orgs_with_testflight: number
+  orgs_with_store_live: number
   activation_telemetry_available: boolean
   // Invite join metrics (team invites)
   total_invite_registrations: number
@@ -3505,6 +3537,8 @@ export interface AdminOnboardingFunnel {
   subscription_conversion_rate: number
   production_device_conversion_rate: number
   update_download_conversion_rate: number
+  testflight_conversion_rate: number
+  store_live_conversion_rate: number
   // Trend data
   trend: Array<{
     date: string
@@ -3516,6 +3550,8 @@ export interface AdminOnboardingFunnel {
     orgs_subscribed: number
     orgs_with_production_device: number
     orgs_with_update_download: number
+    orgs_with_testflight: number
+    orgs_with_store_live: number
   }>
   invite_trend: Array<{
     date: string
@@ -3525,6 +3561,10 @@ export interface AdminOnboardingFunnel {
   }>
 }
 
+function adminOnboardingConversionRate(numerator: number, denominator: number): number {
+  return denominator > 0 ? (numerator / denominator) * 100 : 0
+}
+
 export async function getAdminOnboardingFunnel(
   c: Context,
   start_date: string,
@@ -3595,6 +3635,15 @@ export async function getAdminOnboardingFunnel(
         WHERE si.paid_at IS NOT NULL
           AND si.paid_at >= o.created_at
           AND si.paid_at < o.created_at + interval '7 days'
+      ),
+      orgs_with_distribution AS (
+        SELECT
+          o.id,
+          MAX(CASE WHEN a.onboarding -> 'features' -> 'ota' ->> 'stage' = 'store_live' THEN 1 ELSE 0 END) AS has_store_live,
+          MAX(CASE WHEN a.onboarding -> 'features' -> 'ota' ->> 'stage' = 'testflight' THEN 1 ELSE 0 END) AS has_testflight
+        FROM orgs_with_bundles o
+        INNER JOIN apps a ON a.owner_org = o.id
+        GROUP BY o.id
       )
       SELECT
         (SELECT COUNT(*)::int FROM registrations_in_range) as total_registrations,
@@ -3602,7 +3651,9 @@ export async function getAdminOnboardingFunnel(
         (SELECT COUNT(*)::int FROM orgs_with_apps) as orgs_with_app,
         (SELECT COUNT(*)::int FROM orgs_with_channels) as orgs_with_channel,
         (SELECT COUNT(*)::int FROM orgs_with_bundles) as orgs_with_bundle,
-        (SELECT COUNT(*)::int FROM orgs_subscribed) as orgs_subscribed
+        (SELECT COUNT(*)::int FROM orgs_subscribed) as orgs_subscribed,
+        (SELECT COUNT(*)::int FROM orgs_with_distribution d WHERE d.has_store_live = 0 AND d.has_testflight = 1) as orgs_with_testflight,
+        (SELECT COUNT(*)::int FROM orgs_with_distribution d WHERE d.has_store_live = 1) as orgs_with_store_live
     `
 
     const funnelResult = await drizzleClient.execute(funnelQuery)
@@ -3614,6 +3665,8 @@ export async function getAdminOnboardingFunnel(
     const orgsWithChannel = Number(funnelRow.orgs_with_channel) || 0
     const orgsWithBundle = Number(funnelRow.orgs_with_bundle) || 0
     const orgsSubscribed = Number(funnelRow.orgs_subscribed) || 0
+    const orgsWithTestflight = Number(funnelRow.orgs_with_testflight) || 0
+    const orgsWithStoreLive = Number(funnelRow.orgs_with_store_live) || 0
 
     // Get daily trend data
     const trendQuery = sql`
@@ -3691,6 +3744,38 @@ export async function getAdminOnboardingFunnel(
           AND si.paid_at >= o.created_at
           AND si.paid_at < o.created_at + interval '7 days'
         GROUP BY o.created_at::date
+      ),
+      org_distribution_stages AS (
+        SELECT
+          a.owner_org,
+          MAX(CASE WHEN a.onboarding -> 'features' -> 'ota' ->> 'stage' = 'store_live' THEN 1 ELSE 0 END) AS has_store_live,
+          MAX(CASE WHEN a.onboarding -> 'features' -> 'ota' ->> 'stage' = 'testflight' THEN 1 ELSE 0 END) AS has_testflight
+        FROM apps a
+        INNER JOIN orgs o ON o.id = a.owner_org
+        INNER JOIN public.users u ON u.id = o.created_by
+        WHERE o.created_at >= ${start_date}::timestamp
+          AND o.created_at < ${end_date}::timestamp
+          AND u.created_via_invite = false
+        GROUP BY a.owner_org
+      ),
+      daily_distribution AS (
+        SELECT
+          o.created_at::date as date,
+          COUNT(DISTINCT o.id) FILTER (
+            WHERE stages.has_store_live = 0 AND stages.has_testflight = 1
+          )::int as orgs_with_testflight,
+          COUNT(DISTINCT o.id) FILTER (
+            WHERE stages.has_store_live = 1
+          )::int as orgs_with_store_live
+        FROM orgs o
+        INNER JOIN public.users u ON u.id = o.created_by
+        INNER JOIN apps a ON a.owner_org = o.id
+        INNER JOIN org_distribution_stages stages ON stages.owner_org = o.id
+        WHERE o.created_at >= ${start_date}::timestamp
+          AND o.created_at < ${end_date}::timestamp
+          AND u.created_via_invite = false
+          AND ${onboardingBundleEligibility}
+        GROUP BY o.created_at::date
       )
       SELECT
         ds.date,
@@ -3699,7 +3784,9 @@ export async function getAdminOnboardingFunnel(
         COALESCE(dapps.orgs_created_app, 0) as orgs_created_app,
         COALESCE(dchannels.orgs_created_channel, 0) as orgs_created_channel,
         COALESCE(dbundles.orgs_created_bundle, 0) as orgs_created_bundle,
-        COALESCE(dsubscriptions.orgs_subscribed, 0) as orgs_subscribed
+        COALESCE(dsubscriptions.orgs_subscribed, 0) as orgs_subscribed,
+        COALESCE(ddistribution.orgs_with_testflight, 0) as orgs_with_testflight,
+        COALESCE(ddistribution.orgs_with_store_live, 0) as orgs_with_store_live
       FROM date_series ds
       LEFT JOIN daily_registrations dregs ON dregs.date = ds.date
       LEFT JOIN daily_orgs dorgs ON dorgs.date = ds.date
@@ -3707,6 +3794,7 @@ export async function getAdminOnboardingFunnel(
       LEFT JOIN daily_channels dchannels ON dchannels.date = ds.date
       LEFT JOIN daily_bundles dbundles ON dbundles.date = ds.date
       LEFT JOIN daily_subscriptions dsubscriptions ON dsubscriptions.date = ds.date
+      LEFT JOIN daily_distribution ddistribution ON ddistribution.date = ds.date
       ORDER BY ds.date ASC
     `
 
@@ -3812,6 +3900,8 @@ export async function getAdminOnboardingFunnel(
         orgs_subscribed: Number(row.orgs_subscribed) || 0,
         orgs_with_production_device: activationTrend?.orgs_with_production_device ?? 0,
         orgs_with_update_download: activationTrend?.orgs_with_update_download ?? 0,
+        orgs_with_testflight: Number(row.orgs_with_testflight) || 0,
+        orgs_with_store_live: Number(row.orgs_with_store_live) || 0,
       }
     })
 
@@ -3838,17 +3928,21 @@ export async function getAdminOnboardingFunnel(
       orgs_subscribed: orgsSubscribed,
       orgs_with_production_device: activationMetrics.orgs_with_production_device,
       orgs_with_update_download: activationMetrics.orgs_with_update_download,
+      orgs_with_testflight: orgsWithTestflight,
+      orgs_with_store_live: orgsWithStoreLive,
       activation_telemetry_available: activationTelemetry.available,
       total_invite_registrations: totalInviteRegistrations,
       total_org_joins_invite_register: totalOrgJoinsInviteRegister,
       total_org_joins_existing_account: totalOrgJoinsExistingAccount,
-      org_conversion_rate: totalRegistrations > 0 ? (totalOrgs / totalRegistrations) * 100 : 0,
-      app_conversion_rate: totalOrgs > 0 ? (orgsWithApp / totalOrgs) * 100 : 0,
-      channel_conversion_rate: orgsWithApp > 0 ? (orgsWithChannel / orgsWithApp) * 100 : 0,
-      bundle_conversion_rate: orgsWithChannel > 0 ? (orgsWithBundle / orgsWithChannel) * 100 : 0,
-      subscription_conversion_rate: orgsWithBundle > 0 ? (orgsSubscribed / orgsWithBundle) * 100 : 0,
-      production_device_conversion_rate: orgsWithBundle > 0 ? (activationMetrics.orgs_with_production_device / orgsWithBundle) * 100 : 0,
-      update_download_conversion_rate: activationMetrics.orgs_with_production_device > 0 ? (activationMetrics.orgs_with_update_download / activationMetrics.orgs_with_production_device) * 100 : 0,
+      org_conversion_rate: adminOnboardingConversionRate(totalOrgs, totalRegistrations),
+      app_conversion_rate: adminOnboardingConversionRate(orgsWithApp, totalOrgs),
+      channel_conversion_rate: adminOnboardingConversionRate(orgsWithChannel, orgsWithApp),
+      bundle_conversion_rate: adminOnboardingConversionRate(orgsWithBundle, orgsWithChannel),
+      subscription_conversion_rate: adminOnboardingConversionRate(orgsSubscribed, orgsWithBundle),
+      production_device_conversion_rate: adminOnboardingConversionRate(activationMetrics.orgs_with_production_device, orgsWithBundle),
+      update_download_conversion_rate: adminOnboardingConversionRate(activationMetrics.orgs_with_update_download, activationMetrics.orgs_with_production_device),
+      testflight_conversion_rate: adminOnboardingConversionRate(orgsWithTestflight, orgsWithBundle),
+      store_live_conversion_rate: adminOnboardingConversionRate(orgsWithStoreLive, orgsWithBundle),
       trend,
       invite_trend: inviteTrend,
     }
@@ -3868,6 +3962,8 @@ export async function getAdminOnboardingFunnel(
       orgs_subscribed: 0,
       orgs_with_production_device: 0,
       orgs_with_update_download: 0,
+      orgs_with_testflight: 0,
+      orgs_with_store_live: 0,
       activation_telemetry_available: false,
       total_invite_registrations: 0,
       total_org_joins_invite_register: 0,
@@ -3879,6 +3975,8 @@ export async function getAdminOnboardingFunnel(
       subscription_conversion_rate: 0,
       production_device_conversion_rate: 0,
       update_download_conversion_rate: 0,
+      testflight_conversion_rate: 0,
+      store_live_conversion_rate: 0,
       trend: [],
       invite_trend: [],
     }
diff --git a/supabase/functions/_backend/plugin_runtime/utils/postgres_schema.ts b/supabase/functions/_backend/plugin_runtime/utils/postgres_schema.ts
index d094df6bfe..fd006f7a85 100644
--- a/supabase/functions/_backend/plugin_runtime/utils/postgres_schema.ts
+++ b/supabase/functions/_backend/plugin_runtime/utils/postgres_schema.ts
@@ -24,6 +24,7 @@ export const apps = pgTable('apps', {
   block_provider_infra_requests: boolean('block_provider_infra_requests').notNull().default(true),
   allow_device_custom_id: boolean('allow_device_custom_id').notNull().default(true),
   need_onboarding: boolean('need_onboarding').notNull().default(false),
+  onboarding: jsonb('onboarding').notNull().default({}),
   created_from_onboarding: boolean('created_from_onboarding').notNull().default(false),
   onboarding_completed_at: timestamp('onboarding_completed_at', { withTimezone: true }),
   existing_app: boolean('existing_app').notNull().default(false),
diff --git a/supabase/functions/_backend/plugin_runtime/utils/supabase.types.ts b/supabase/functions/_backend/plugin_runtime/utils/supabase.types.ts
index b814a5b1e1..03ee9daa1c 100644
--- a/supabase/functions/_backend/plugin_runtime/utils/supabase.types.ts
+++ b/supabase/functions/_backend/plugin_runtime/utils/supabase.types.ts
@@ -333,6 +333,7 @@ export type Database = {
           manifest_bundle_count: number
           name: string | null
           need_onboarding: boolean
+          onboarding: Json
           onboarding_completed_at: string | null
           owner_org: string
           retention: number
@@ -365,6 +366,7 @@ export type Database = {
           manifest_bundle_count?: number
           name?: string | null
           need_onboarding?: boolean
+          onboarding?: Json
           onboarding_completed_at?: string | null
           owner_org: string
           retention?: number
@@ -397,6 +399,7 @@ export type Database = {
           manifest_bundle_count?: number
           name?: string | null
           need_onboarding?: boolean
+          onboarding?: Json
           onboarding_completed_at?: string | null
           owner_org?: string
           retention?: number
@@ -3947,6 +3950,7 @@ export type Database = {
           manifest_bundle_count: number
           name: string | null
           need_onboarding: boolean
+          onboarding: Json
           onboarding_completed_at: string | null
           owner_org: string
           retention: number
@@ -4679,6 +4683,10 @@ export type Database = {
         Returns: undefined
       }
       mark_app_stats_refreshed: { Args: { p_app_id: string }; Returns: string }
+      mark_onboarding_feature_started: {
+        Args: { p_app_id: string, p_feature_key: string }
+        Returns: Json
+      }
       mass_edit_queue_messages_cf_ids: {
         Args: {
           updates: Database["public"]["CompositeTypes"]["message_update"][]
diff --git a/supabase/functions/_backend/utils/pg.ts b/supabase/functions/_backend/utils/pg.ts
index 119faa457b..363d4c8bb2 100644
--- a/supabase/functions/_backend/utils/pg.ts
+++ b/supabase/functions/_backend/utils/pg.ts
@@ -2481,6 +2481,7 @@ export interface AdminOrganizationInsightRow {
   last_build_at: string | null
   paid_at: string | null
   registered_at: string
+  distribution_stage: string | null
 }
 
 export interface AdminOrganizationInsightsResult {
@@ -2687,6 +2688,32 @@ export async function getAdminOrganizationInsights(
         FROM build_logs bl
         INNER JOIN filtered_orgs filtered ON filtered.org_id = bl.org_id
         GROUP BY bl.org_id
+      ),
+      onboarding_stage_by_org AS (
+        SELECT
+          a.owner_org AS org_id,
+          CASE MAX(
+            CASE a.onboarding -> 'features' -> 'ota' ->> 'stage'
+              WHEN 'store_live' THEN 5
+              WHEN 'testflight' THEN 4
+              WHEN 'play_unknown' THEN 3
+              WHEN 'native_unknown' THEN 2
+              WHEN 'local_only' THEN 1
+              WHEN 'no_device' THEN 0
+              ELSE -1
+            END
+          )
+            WHEN 5 THEN 'store_live'
+            WHEN 4 THEN 'testflight'
+            WHEN 3 THEN 'play_unknown'
+            WHEN 2 THEN 'native_unknown'
+            WHEN 1 THEN 'local_only'
+            WHEN 0 THEN 'no_device'
+            ELSE NULL
+          END AS distribution_stage
+        FROM apps a
+        INNER JOIN filtered_orgs filtered ON filtered.org_id = a.owner_org
+        GROUP BY a.owner_org
       )
       SELECT
         filtered.org_id,
@@ -2707,7 +2734,8 @@ export async function getAdminOrganizationInsights(
         buo.last_upload_at,
         lb.last_build_at,
         filtered.paid_at,
-        filtered.registered_at
+        filtered.registered_at,
+        stage.distribution_stage
       FROM filtered_orgs filtered
       LEFT JOIN apps_by_org apps ON apps.org_id = filtered.org_id
       LEFT JOIN members_by_org members ON members.org_id = filtered.org_id
@@ -2715,6 +2743,7 @@ export async function getAdminOrganizationInsights(
       LEFT JOIN build_usage_by_org bu ON bu.org_id = filtered.org_id
       LEFT JOIN bundle_uploads_by_org buo ON buo.org_id = filtered.org_id
       LEFT JOIN last_builds_by_org lb ON lb.org_id = filtered.org_id
+      LEFT JOIN onboarding_stage_by_org stage ON stage.org_id = filtered.org_id
       ORDER BY
         filtered.needs_attention DESC,
         CASE
@@ -2770,6 +2799,7 @@ export async function getAdminOrganizationInsights(
       last_build_at: normalizeTimestamp(row.last_build_at),
       paid_at: normalizeTimestamp(row.paid_at),
       registered_at: normalizeTimestamp(row.registered_at) ?? '',
+      distribution_stage: row.distribution_stage ?? null,
     }))
 
     const total = Number((countResult.rows[0] as any)?.total) || 0
@@ -3151,6 +3181,8 @@ export interface AdminOnboardingFunnel {
   orgs_subscribed: number
   orgs_with_production_device: number
   orgs_with_update_download: number
+  orgs_with_testflight: number
+  orgs_with_store_live: number
   activation_telemetry_available: boolean
   // Invite join metrics (team invites)
   total_invite_registrations: number
@@ -3164,6 +3196,8 @@ export interface AdminOnboardingFunnel {
   subscription_conversion_rate: number
   production_device_conversion_rate: number
   update_download_conversion_rate: number
+  testflight_conversion_rate: number
+  store_live_conversion_rate: number
   // Trend data
   trend: Array<{
     date: string
@@ -3175,6 +3209,8 @@ export interface AdminOnboardingFunnel {
     orgs_subscribed: number
     orgs_with_production_device: number
     orgs_with_update_download: number
+    orgs_with_testflight: number
+    orgs_with_store_live: number
   }>
   invite_trend: Array<{
     date: string
@@ -3190,6 +3226,10 @@ export interface AdminOnboardingFunnel {
   }>
 }
 
+function adminOnboardingConversionRate(numerator: number, denominator: number): number {
+  return denominator > 0 ? (numerator / denominator) * 100 : 0
+}
+
 export async function getAdminOnboardingFunnel(
   c: Context,
   start_date: string,
@@ -3260,6 +3300,15 @@ export async function getAdminOnboardingFunnel(
         WHERE si.paid_at IS NOT NULL
           AND si.paid_at >= o.created_at
           AND si.paid_at < o.created_at + interval '7 days'
+      ),
+      orgs_with_distribution AS (
+        SELECT
+          o.id,
+          MAX(CASE WHEN a.onboarding -> 'features' -> 'ota' ->> 'stage' = 'store_live' THEN 1 ELSE 0 END) AS has_store_live,
+          MAX(CASE WHEN a.onboarding -> 'features' -> 'ota' ->> 'stage' = 'testflight' THEN 1 ELSE 0 END) AS has_testflight
+        FROM orgs_with_bundles o
+        INNER JOIN apps a ON a.owner_org = o.id
+        GROUP BY o.id
       )
       SELECT
         (SELECT COUNT(*)::int FROM registrations_in_range) as total_registrations,
@@ -3267,7 +3316,9 @@ export async function getAdminOnboardingFunnel(
         (SELECT COUNT(*)::int FROM orgs_with_apps) as orgs_with_app,
         (SELECT COUNT(*)::int FROM orgs_with_channels) as orgs_with_channel,
         (SELECT COUNT(*)::int FROM orgs_with_bundles) as orgs_with_bundle,
-        (SELECT COUNT(*)::int FROM orgs_subscribed) as orgs_subscribed
+        (SELECT COUNT(*)::int FROM orgs_subscribed) as orgs_subscribed,
+        (SELECT COUNT(*)::int FROM orgs_with_distribution d WHERE d.has_store_live = 0 AND d.has_testflight = 1) as orgs_with_testflight,
+        (SELECT COUNT(*)::int FROM orgs_with_distribution d WHERE d.has_store_live = 1) as orgs_with_store_live
     `
 
     const funnelResult = await drizzleClient.execute(funnelQuery)
@@ -3279,6 +3330,8 @@ export async function getAdminOnboardingFunnel(
     const orgsWithChannel = Number(funnelRow.orgs_with_channel) || 0
     const orgsWithBundle = Number(funnelRow.orgs_with_bundle) || 0
     const orgsSubscribed = Number(funnelRow.orgs_subscribed) || 0
+    const orgsWithTestflight = Number(funnelRow.orgs_with_testflight) || 0
+    const orgsWithStoreLive = Number(funnelRow.orgs_with_store_live) || 0
 
     // Get daily trend data
     const trendQuery = sql`
@@ -3356,6 +3409,38 @@ export async function getAdminOnboardingFunnel(
           AND si.paid_at >= o.created_at
           AND si.paid_at < o.created_at + interval '7 days'
         GROUP BY o.created_at::date
+      ),
+      org_distribution_stages AS (
+        SELECT
+          a.owner_org,
+          MAX(CASE WHEN a.onboarding -> 'features' -> 'ota' ->> 'stage' = 'store_live' THEN 1 ELSE 0 END) AS has_store_live,
+          MAX(CASE WHEN a.onboarding -> 'features' -> 'ota' ->> 'stage' = 'testflight' THEN 1 ELSE 0 END) AS has_testflight
+        FROM apps a
+        INNER JOIN orgs o ON o.id = a.owner_org
+        INNER JOIN public.users u ON u.id = o.created_by
+        WHERE o.created_at >= ${start_date}::timestamp
+          AND o.created_at < ${end_date}::timestamp
+          AND u.created_via_invite = false
+        GROUP BY a.owner_org
+      ),
+      daily_distribution AS (
+        SELECT
+          o.created_at::date as date,
+          COUNT(DISTINCT o.id) FILTER (
+            WHERE stages.has_store_live = 0 AND stages.has_testflight = 1
+          )::int as orgs_with_testflight,
+          COUNT(DISTINCT o.id) FILTER (
+            WHERE stages.has_store_live = 1
+          )::int as orgs_with_store_live
+        FROM orgs o
+        INNER JOIN public.users u ON u.id = o.created_by
+        INNER JOIN apps a ON a.owner_org = o.id
+        INNER JOIN org_distribution_stages stages ON stages.owner_org = o.id
+        WHERE o.created_at >= ${start_date}::timestamp
+          AND o.created_at < ${end_date}::timestamp
+          AND u.created_via_invite = false
+          AND ${onboardingBundleEligibility}
+        GROUP BY o.created_at::date
       )
       SELECT
         ds.date,
@@ -3364,7 +3449,9 @@ export async function getAdminOnboardingFunnel(
         COALESCE(dapps.orgs_created_app, 0) as orgs_created_app,
         COALESCE(dchannels.orgs_created_channel, 0) as orgs_created_channel,
         COALESCE(dbundles.orgs_created_bundle, 0) as orgs_created_bundle,
-        COALESCE(dsubscriptions.orgs_subscribed, 0) as orgs_subscribed
+        COALESCE(dsubscriptions.orgs_subscribed, 0) as orgs_subscribed,
+        COALESCE(ddistribution.orgs_with_testflight, 0) as orgs_with_testflight,
+        COALESCE(ddistribution.orgs_with_store_live, 0) as orgs_with_store_live
       FROM date_series ds
       LEFT JOIN daily_registrations dregs ON dregs.date = ds.date
       LEFT JOIN daily_orgs dorgs ON dorgs.date = ds.date
@@ -3372,6 +3459,7 @@ export async function getAdminOnboardingFunnel(
       LEFT JOIN daily_channels dchannels ON dchannels.date = ds.date
       LEFT JOIN daily_bundles dbundles ON dbundles.date = ds.date
       LEFT JOIN daily_subscriptions dsubscriptions ON dsubscriptions.date = ds.date
+      LEFT JOIN daily_distribution ddistribution ON ddistribution.date = ds.date
       ORDER BY ds.date ASC
     `
 
@@ -3512,6 +3600,8 @@ export async function getAdminOnboardingFunnel(
         orgs_subscribed: Number(row.orgs_subscribed) || 0,
         orgs_with_production_device: activationTrend?.orgs_with_production_device ?? 0,
         orgs_with_update_download: activationTrend?.orgs_with_update_download ?? 0,
+        orgs_with_testflight: Number(row.orgs_with_testflight) || 0,
+        orgs_with_store_live: Number(row.orgs_with_store_live) || 0,
       }
     })
 
@@ -3545,17 +3635,21 @@ export async function getAdminOnboardingFunnel(
       orgs_subscribed: orgsSubscribed,
       orgs_with_production_device: activationMetrics.orgs_with_production_device,
       orgs_with_update_download: activationMetrics.orgs_with_update_download,
+      orgs_with_testflight: orgsWithTestflight,
+      orgs_with_store_live: orgsWithStoreLive,
       activation_telemetry_available: activationTelemetry.available,
       total_invite_registrations: totalInviteRegistrations,
       total_org_joins_invite_register: totalOrgJoinsInviteRegister,
       total_org_joins_existing_account: totalOrgJoinsExistingAccount,
-      org_conversion_rate: totalRegistrations > 0 ? (totalOrgs / totalRegistrations) * 100 : 0,
-      app_conversion_rate: totalOrgs > 0 ? (orgsWithApp / totalOrgs) * 100 : 0,
-      channel_conversion_rate: orgsWithApp > 0 ? (orgsWithChannel / orgsWithApp) * 100 : 0,
-      bundle_conversion_rate: orgsWithChannel > 0 ? (orgsWithBundle / orgsWithChannel) * 100 : 0,
-      subscription_conversion_rate: orgsWithBundle > 0 ? (orgsSubscribed / orgsWithBundle) * 100 : 0,
-      production_device_conversion_rate: orgsWithBundle > 0 ? (activationMetrics.orgs_with_production_device / orgsWithBundle) * 100 : 0,
-      update_download_conversion_rate: activationMetrics.orgs_with_production_device > 0 ? (activationMetrics.orgs_with_update_download / activationMetrics.orgs_with_production_device) * 100 : 0,
+      org_conversion_rate: adminOnboardingConversionRate(totalOrgs, totalRegistrations),
+      app_conversion_rate: adminOnboardingConversionRate(orgsWithApp, totalOrgs),
+      channel_conversion_rate: adminOnboardingConversionRate(orgsWithChannel, orgsWithApp),
+      bundle_conversion_rate: adminOnboardingConversionRate(orgsWithBundle, orgsWithChannel),
+      subscription_conversion_rate: adminOnboardingConversionRate(orgsSubscribed, orgsWithBundle),
+      production_device_conversion_rate: adminOnboardingConversionRate(activationMetrics.orgs_with_production_device, orgsWithBundle),
+      update_download_conversion_rate: adminOnboardingConversionRate(activationMetrics.orgs_with_update_download, activationMetrics.orgs_with_production_device),
+      testflight_conversion_rate: adminOnboardingConversionRate(orgsWithTestflight, orgsWithBundle),
+      store_live_conversion_rate: adminOnboardingConversionRate(orgsWithStoreLive, orgsWithBundle),
       trend,
       invite_trend: inviteTrend,
       registration_source_trend: registrationSourceTrend,
@@ -3576,6 +3670,8 @@ export async function getAdminOnboardingFunnel(
       orgs_subscribed: 0,
       orgs_with_production_device: 0,
       orgs_with_update_download: 0,
+      orgs_with_testflight: 0,
+      orgs_with_store_live: 0,
       activation_telemetry_available: false,
       total_invite_registrations: 0,
       total_org_joins_invite_register: 0,
@@ -3587,6 +3683,8 @@ export async function getAdminOnboardingFunnel(
       subscription_conversion_rate: 0,
       production_device_conversion_rate: 0,
       update_download_conversion_rate: 0,
+      testflight_conversion_rate: 0,
+      store_live_conversion_rate: 0,
       trend: [],
       invite_trend: [],
       registration_source_trend: [],
diff --git a/supabase/functions/_backend/utils/postgres_schema.ts b/supabase/functions/_backend/utils/postgres_schema.ts
index d094df6bfe..fd006f7a85 100644
--- a/supabase/functions/_backend/utils/postgres_schema.ts
+++ b/supabase/functions/_backend/utils/postgres_schema.ts
@@ -24,6 +24,7 @@ export const apps = pgTable('apps', {
   block_provider_infra_requests: boolean('block_provider_infra_requests').notNull().default(true),
   allow_device_custom_id: boolean('allow_device_custom_id').notNull().default(true),
   need_onboarding: boolean('need_onboarding').notNull().default(false),
+  onboarding: jsonb('onboarding').notNull().default({}),
   created_from_onboarding: boolean('created_from_onboarding').notNull().default(false),
   onboarding_completed_at: timestamp('onboarding_completed_at', { withTimezone: true }),
   existing_app: boolean('existing_app').notNull().default(false),
diff --git a/supabase/functions/_backend/utils/supabase.types.ts b/supabase/functions/_backend/utils/supabase.types.ts
index e68825a23a..9e7f86f473 100644
--- a/supabase/functions/_backend/utils/supabase.types.ts
+++ b/supabase/functions/_backend/utils/supabase.types.ts
@@ -333,6 +333,7 @@ export type Database = {
           manifest_bundle_count: number
           name: string | null
           need_onboarding: boolean
+          onboarding: Json
           onboarding_completed_at: string | null
           owner_org: string
           retention: number
@@ -365,6 +366,7 @@ export type Database = {
           manifest_bundle_count?: number
           name?: string | null
           need_onboarding?: boolean
+          onboarding?: Json
           onboarding_completed_at?: string | null
           owner_org: string
           retention?: number
@@ -397,6 +399,7 @@ export type Database = {
           manifest_bundle_count?: number
           name?: string | null
           need_onboarding?: boolean
+          onboarding?: Json
           onboarding_completed_at?: string | null
           owner_org?: string
           retention?: number
@@ -4137,6 +4140,7 @@ export type Database = {
           manifest_bundle_count: number
           name: string | null
           need_onboarding: boolean
+          onboarding: Json
           onboarding_completed_at: string | null
           owner_org: string
           retention: number
@@ -4870,6 +4874,10 @@ export type Database = {
       }
       long_canceled_org_ids: { Args: never; Returns: string[] }
       mark_app_stats_refreshed: { Args: { p_app_id: string }; Returns: string }
+      mark_onboarding_feature_started: {
+        Args: { p_app_id: string, p_feature_key: string }
+        Returns: Json
+      }
       mass_edit_queue_messages_cf_ids: {
         Args: {
           updates: Database["public"]["CompositeTypes"]["message_update"][]
diff --git a/supabase/migrations/20260813105739_app_onboarding_progress.sql b/supabase/migrations/20260813105739_app_onboarding_progress.sql
new file mode 100644
index 0000000000..d964d600a6
--- /dev/null
+++ b/supabase/migrations/20260813105739_app_onboarding_progress.sql
@@ -0,0 +1,656 @@
+-- App-level onboarding ledger (started / succeeded / last used / 30d retained / distribution stage).
+-- Feature keys live in application code; this JSON is the durable store.
+--
+-- Execution model:
+-- - mark_onboarding_feature_started: user-facing RPC, once per click, indexed apps.app_id
+--   lookup plus one rbac_check_permission_request. Cannot set succeeded/retained/stage.
+-- - refresh_app_onboarding_progress: hourly cron_tasks job, service_role only. Pages apps
+--   by app_id (LIMIT 500), then bounded joins on devices (partial app_id indexes),
+--   app_versions(app_id), daily_version(app_id, date), build_requests(app_id).
+-- - User-facing writes to apps.onboarding are blocked by protect_apps_onboarding
+--   on INSERT and UPDATE; only SECURITY DEFINER RPCs and service_role/postgres
+--   can change the column. Authenticated inserts are forced to '{}'.
+
+ALTER TABLE "public"."apps"
+  ADD COLUMN IF NOT EXISTS "onboarding" "jsonb" DEFAULT '{}'::"jsonb" NOT NULL;
+
+ALTER TABLE "public"."apps"
+  DROP CONSTRAINT IF EXISTS "apps_onboarding_valid";
+
+ALTER TABLE "public"."apps"
+  ADD CONSTRAINT "apps_onboarding_valid" CHECK (
+    ("jsonb_typeof"("onboarding") = 'object'::"text")
+    AND (
+      (NOT ("onboarding" ? 'features'::"text"))
+      OR ("jsonb_typeof"(("onboarding" -> 'features'::"text")) = 'object'::"text")
+    )
+  );
+
+COMMENT ON COLUMN "public"."apps"."onboarding" IS
+  'Extensible feature onboarding ledger. Shape: {"refreshed_at": iso, "features": { "<key>": { "started_at", "succeeded_at", "last_used_at", "retained_30d_at", "stage"? } }}. Success/usage/stage are written by refresh_app_onboarding_progress; clients may only set started_at via mark_onboarding_feature_started.';
+
+CREATE OR REPLACE FUNCTION "public"."protect_apps_onboarding"() RETURNS "trigger"
+    LANGUAGE "plpgsql"
+    SET "search_path" TO ''
+    AS $$
+BEGIN
+  IF current_user IN ('authenticated', 'anon') THEN
+    IF TG_OP = 'INSERT' THEN
+      NEW.onboarding := '{}'::jsonb;
+    ELSIF TG_OP = 'UPDATE' AND NEW.onboarding IS DISTINCT FROM OLD.onboarding THEN
+      NEW.onboarding := OLD.onboarding;
+    END IF;
+  END IF;
+  RETURN NEW;
+END;
+$$;
+
+ALTER FUNCTION "public"."protect_apps_onboarding"() OWNER TO "postgres";
+
+REVOKE ALL ON FUNCTION "public"."protect_apps_onboarding"() FROM PUBLIC;
+GRANT ALL ON FUNCTION "public"."protect_apps_onboarding"() TO "postgres";
+GRANT ALL ON FUNCTION "public"."protect_apps_onboarding"() TO "service_role";
+GRANT ALL ON FUNCTION "public"."protect_apps_onboarding"() TO "authenticated";
+GRANT ALL ON FUNCTION "public"."protect_apps_onboarding"() TO "anon";
+
+DROP TRIGGER IF EXISTS "protect_apps_onboarding" ON "public"."apps";
+CREATE TRIGGER "protect_apps_onboarding"
+  BEFORE INSERT OR UPDATE ON "public"."apps"
+  FOR EACH ROW
+  EXECUTE FUNCTION "public"."protect_apps_onboarding"();
+
+CREATE INDEX IF NOT EXISTS "idx_apps_onboarding_ota_stage"
+  ON "public"."apps" (("onboarding" -> 'features'::"text" -> 'ota'::"text" ->> 'stage'::"text"));
+
+CREATE INDEX IF NOT EXISTS "idx_apps_onboarding_refreshed_at"
+  ON "public"."apps" ((COALESCE(("onboarding" ->> 'refreshed_at'::"text"), ''::"text")), "app_id");
+
+CREATE OR REPLACE FUNCTION "public"."merge_app_onboarding_feature"(
+  "p_existing" "jsonb",
+  "p_started_at" timestamp with time zone,
+  "p_succeeded_at" timestamp with time zone,
+  "p_last_used_at" timestamp with time zone,
+  "p_stage" "text" DEFAULT NULL::"text"
+) RETURNS "jsonb"
+LANGUAGE "plpgsql"
+STABLE
+SET "search_path" TO ''
+AS $$
+DECLARE
+  v_existing jsonb := COALESCE(p_existing, '{}'::jsonb);
+  v_started timestamptz;
+  v_succeeded timestamptz;
+  v_last_used timestamptz;
+  v_retained timestamptz;
+  v_stage text;
+  v_existing_stage text;
+  v_new_rank integer;
+  v_old_rank integer;
+BEGIN
+  BEGIN
+    v_started := NULLIF(v_existing->>'started_at', '')::timestamptz;
+  EXCEPTION WHEN invalid_datetime_format OR datetime_field_overflow THEN
+    v_started := NULL;
+  END;
+  BEGIN
+    v_succeeded := NULLIF(v_existing->>'succeeded_at', '')::timestamptz;
+  EXCEPTION WHEN invalid_datetime_format OR datetime_field_overflow THEN
+    v_succeeded := NULL;
+  END;
+  BEGIN
+    v_last_used := NULLIF(v_existing->>'last_used_at', '')::timestamptz;
+  EXCEPTION WHEN invalid_datetime_format OR datetime_field_overflow THEN
+    v_last_used := NULL;
+  END;
+  BEGIN
+    v_retained := NULLIF(v_existing->>'retained_30d_at', '')::timestamptz;
+  EXCEPTION WHEN invalid_datetime_format OR datetime_field_overflow THEN
+    v_retained := NULL;
+  END;
+
+  v_started := COALESCE(v_started, p_started_at);
+  v_succeeded := COALESCE(v_succeeded, p_succeeded_at);
+  v_last_used := GREATEST(v_last_used, p_last_used_at);
+
+  IF v_retained IS NULL
+    AND v_succeeded IS NOT NULL
+    AND v_last_used IS NOT NULL
+    AND v_last_used >= v_succeeded + INTERVAL '30 days'
+  THEN
+    v_retained := v_last_used;
+  END IF;
+
+  v_existing_stage := NULLIF(v_existing->>'stage', '');
+  v_new_rank := CASE p_stage
+    WHEN 'store_live' THEN 5
+    WHEN 'testflight' THEN 4
+    WHEN 'play_unknown' THEN 3
+    WHEN 'native_unknown' THEN 2
+    WHEN 'local_only' THEN 1
+    WHEN 'no_device' THEN 0
+    ELSE -1
+  END;
+  v_old_rank := CASE v_existing_stage
+    WHEN 'store_live' THEN 5
+    WHEN 'testflight' THEN 4
+    WHEN 'play_unknown' THEN 3
+    WHEN 'native_unknown' THEN 2
+    WHEN 'local_only' THEN 1
+    WHEN 'no_device' THEN 0
+    ELSE -1
+  END;
+  IF p_stage IS NOT NULL AND v_new_rank >= v_old_rank THEN
+    v_stage := p_stage;
+  ELSE
+    v_stage := v_existing_stage;
+  END IF;
+
+  RETURN jsonb_strip_nulls(jsonb_build_object(
+    'started_at', CASE WHEN v_started IS NULL THEN NULL
+      ELSE to_char(v_started AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"') END,
+    'succeeded_at', CASE WHEN v_succeeded IS NULL THEN NULL
+      ELSE to_char(v_succeeded AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"') END,
+    'last_used_at', CASE WHEN v_last_used IS NULL THEN NULL
+      ELSE to_char(v_last_used AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"') END,
+    'retained_30d_at', CASE WHEN v_retained IS NULL THEN NULL
+      ELSE to_char(v_retained AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"') END,
+    'stage', v_stage
+  ));
+END;
+$$;
+
+ALTER FUNCTION "public"."merge_app_onboarding_feature"("jsonb", timestamp with time zone, timestamp with time zone, timestamp with time zone, "text") OWNER TO "postgres";
+REVOKE ALL ON FUNCTION "public"."merge_app_onboarding_feature"("jsonb", timestamp with time zone, timestamp with time zone, timestamp with time zone, "text") FROM PUBLIC;
+GRANT ALL ON FUNCTION "public"."merge_app_onboarding_feature"("jsonb", timestamp with time zone, timestamp with time zone, timestamp with time zone, "text") TO "service_role";
+
+CREATE OR REPLACE FUNCTION "public"."mark_onboarding_feature_started"(
+  "p_app_id" character varying,
+  "p_feature_key" "text"
+) RETURNS "jsonb"
+LANGUAGE "plpgsql"
+SECURITY DEFINER
+SET "search_path" TO ''
+AS $$
+DECLARE
+  v_owner_org uuid;
+  v_onboarding jsonb;
+  v_feature jsonb;
+  v_now text;
+BEGIN
+  IF p_app_id IS NULL OR btrim(p_app_id) = '' THEN
+    RAISE EXCEPTION 'APP_NOT_FOUND';
+  END IF;
+
+  IF p_feature_key IS NULL OR p_feature_key !~ '^[a-z][a-z0-9_]{0,62}$' THEN
+    RAISE EXCEPTION 'INVALID_FEATURE_KEY';
+  END IF;
+
+  SELECT apps.owner_org, apps.onboarding
+  INTO v_owner_org, v_onboarding
+  FROM public.apps
+  WHERE apps.app_id = p_app_id
+  FOR UPDATE;
+
+  IF v_owner_org IS NULL THEN
+    RAISE EXCEPTION 'NO_PERMISSION';
+  END IF;
+
+  IF NOT public.rbac_check_permission_request(
+    public.rbac_perm_app_read(),
+    v_owner_org,
+    p_app_id,
+    NULL::bigint
+  ) THEN
+    RAISE EXCEPTION 'NO_PERMISSION';
+  END IF;
+
+  v_onboarding := COALESCE(v_onboarding, '{}'::jsonb);
+  IF jsonb_typeof(v_onboarding->'features') IS DISTINCT FROM 'object' THEN
+    v_onboarding := v_onboarding || jsonb_build_object('features', '{}'::jsonb);
+  END IF;
+
+  v_feature := v_onboarding->'features'->p_feature_key;
+  IF jsonb_typeof(v_feature) IS DISTINCT FROM 'object' THEN
+    v_feature := '{}'::jsonb;
+  END IF;
+
+  IF NULLIF(v_feature->>'started_at', '') IS NULL THEN
+    v_now := to_char((now() AT TIME ZONE 'UTC'), 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"');
+    v_feature := v_feature || jsonb_build_object('started_at', v_now);
+    v_onboarding := jsonb_set(v_onboarding, ARRAY['features', p_feature_key], v_feature, true);
+
+    UPDATE public.apps
+    SET onboarding = v_onboarding,
+        updated_at = now()
+    WHERE apps.app_id = p_app_id;
+  END IF;
+
+  RETURN v_onboarding;
+END;
+$$;
+
+ALTER FUNCTION "public"."mark_onboarding_feature_started"(character varying, "text") OWNER TO "postgres";
+REVOKE ALL ON FUNCTION "public"."mark_onboarding_feature_started"(character varying, "text") FROM PUBLIC;
+GRANT ALL ON FUNCTION "public"."mark_onboarding_feature_started"(character varying, "text") TO "authenticated";
+GRANT ALL ON FUNCTION "public"."mark_onboarding_feature_started"(character varying, "text") TO "service_role";
+
+COMMENT ON FUNCTION "public"."mark_onboarding_feature_started"(character varying, "text") IS
+  'Sets features.<key>.started_at once when the caller can read the app. Does not write succeeded_at, last_used_at, retained_30d_at, or stage.';
+
+CREATE OR REPLACE FUNCTION "public"."refresh_app_onboarding_progress"(
+  "p_batch_size" integer DEFAULT 500
+) RETURNS integer
+LANGUAGE "plpgsql"
+SECURITY DEFINER
+SET "search_path" TO ''
+AS $$
+DECLARE
+  v_limit integer := GREATEST(1, LEAST(COALESCE(p_batch_size, 500), 2000));
+  v_updated integer := 0;
+BEGIN
+  WITH batch AS (
+    SELECT apps.app_id
+    FROM public.apps
+    ORDER BY COALESCE(apps.onboarding->>'refreshed_at', ''), apps.app_id
+    LIMIT v_limit
+  ),
+  device_signals AS (
+    SELECT
+      devices.app_id,
+      bool_or(devices.install_source = 'app_store') AS has_app_store,
+      bool_or(devices.install_source = 'testflight') AS has_testflight,
+      bool_or(devices.install_source IN (
+        'google_play',
+        'amazon_appstore',
+        'samsung_galaxy_store',
+        'huawei_appgallery'
+      )) AS has_play_unknown,
+      bool_or(devices.is_prod IS TRUE AND devices.is_emulator IS NOT TRUE) AS has_native,
+      bool_or(devices.install_source IS NOT NULL) AS has_install_source,
+      MAX(devices.updated_at) AS last_device_at
+    FROM public.devices
+    INNER JOIN batch ON batch.app_id = devices.app_id
+    WHERE devices.install_source IS NOT NULL
+       OR (devices.is_prod IS TRUE AND devices.is_emulator IS NOT TRUE)
+    GROUP BY devices.app_id
+  ),
+  bundle_signals AS (
+    SELECT
+      app_versions.app_id,
+      MIN(app_versions.created_at) AS first_bundle_at,
+      MAX(app_versions.created_at) AS last_bundle_at
+    FROM public.app_versions
+    INNER JOIN batch ON batch.app_id = app_versions.app_id
+    WHERE app_versions.deleted IS NOT TRUE
+      AND app_versions.name IS DISTINCT FROM 'builtin'
+      AND app_versions.name IS DISTINCT FROM 'unknown'
+    GROUP BY app_versions.app_id
+  ),
+  install_signals AS (
+    SELECT
+      daily_version.app_id,
+      MIN(daily_version.date)::timestamptz AS first_install_at,
+      MAX(daily_version.date)::timestamptz AS last_install_at
+    FROM public.daily_version
+    INNER JOIN batch ON batch.app_id = daily_version.app_id
+    WHERE COALESCE(daily_version.install, 0) > 0
+    GROUP BY daily_version.app_id
+  ),
+  build_signals AS (
+    SELECT
+      build_requests.app_id,
+      MIN(build_requests.created_at) AS first_build_at,
+      MIN(build_requests.completed_at) FILTER (
+        WHERE build_requests.status IN ('succeeded', 'released')
+      ) AS first_success_at,
+      MAX(COALESCE(build_requests.completed_at, build_requests.created_at)) AS last_build_at
+    FROM public.build_requests
+    INNER JOIN batch ON batch.app_id = build_requests.app_id
+    GROUP BY build_requests.app_id
+  ),
+  merged AS (
+    SELECT
+      batch.app_id,
+      public.merge_app_onboarding_feature(
+        apps.onboarding->'features'->'cli_install',
+        device_signals.last_device_at,
+        device_signals.last_device_at,
+        device_signals.last_device_at,
+        NULL
+      ) AS cli_install,
+      public.merge_app_onboarding_feature(
+        apps.onboarding->'features'->'ota',
+        bundle_signals.first_bundle_at,
+        install_signals.first_install_at,
+        GREATEST(install_signals.last_install_at, bundle_signals.last_bundle_at),
+        CASE
+          WHEN device_signals.has_app_store THEN 'store_live'
+          WHEN device_signals.has_testflight THEN 'testflight'
+          WHEN device_signals.has_play_unknown THEN 'play_unknown'
+          WHEN device_signals.has_native THEN 'native_unknown'
+          WHEN device_signals.has_install_source THEN 'local_only'
+          ELSE 'no_device'
+        END
+      ) AS ota,
+      public.merge_app_onboarding_feature(
+        apps.onboarding->'features'->'builder',
+        build_signals.first_build_at,
+        build_signals.first_success_at,
+        build_signals.last_build_at,
+        NULL
+      ) AS builder
+    FROM batch
+    INNER JOIN public.apps ON apps.app_id = batch.app_id
+    LEFT JOIN device_signals ON device_signals.app_id = batch.app_id
+    LEFT JOIN bundle_signals ON bundle_signals.app_id = batch.app_id
+    LEFT JOIN install_signals ON install_signals.app_id = batch.app_id
+    LEFT JOIN build_signals ON build_signals.app_id = batch.app_id
+  )
+  UPDATE public.apps
+  SET
+    onboarding = jsonb_strip_nulls(
+      COALESCE(apps.onboarding, '{}'::jsonb)
+      || jsonb_build_object(
+        'refreshed_at', to_char((now() AT TIME ZONE 'UTC'), 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'),
+        'features', COALESCE(apps.onboarding->'features', '{}'::jsonb) || jsonb_build_object(
+          'cli_install', merged.cli_install,
+          'ota', merged.ota,
+          'builder', merged.builder
+        )
+      )
+    ),
+    updated_at = now()
+  FROM merged
+  WHERE apps.app_id = merged.app_id;
+
+  GET DIAGNOSTICS v_updated = ROW_COUNT;
+  RETURN v_updated;
+END;
+$$;
+
+ALTER FUNCTION "public"."refresh_app_onboarding_progress"(integer) OWNER TO "postgres";
+REVOKE ALL ON FUNCTION "public"."refresh_app_onboarding_progress"(integer) FROM PUBLIC;
+GRANT ALL ON FUNCTION "public"."refresh_app_onboarding_progress"(integer) TO "service_role";
+
+COMMENT ON FUNCTION "public"."refresh_app_onboarding_progress"(integer) IS
+  'Hourly bounded backfill/refresh of apps.onboarding from devices, bundles, daily_version installs, and build_requests. Never called from plugin request paths.';
+
+INSERT INTO public.cron_tasks (
+  name,
+  description,
+  task_type,
+  target,
+  batch_size,
+  payload,
+  second_interval,
+  minute_interval,
+  hour_interval,
+  run_at_hour,
+  run_at_minute,
+  run_at_second,
+  run_on_dow,
+  run_on_day,
+  enabled
+) VALUES (
+  'refresh_app_onboarding_progress',
+  'Refresh apps.onboarding feature ledger (started/succeeded/last_used/stage) in bounded batches',
+  'function',
+  'public.refresh_app_onboarding_progress(2000)',
+  2000, -- informational: function tasks execute `target` as SELECT; batch_size is unused
+  NULL,
+  NULL,
+  NULL,
+  1,
+  NULL,
+  20,
+  NULL,
+  NULL,
+  NULL,
+  true
+)
+ON CONFLICT (name) DO UPDATE
+SET
+  description = EXCLUDED.description,
+  task_type = EXCLUDED.task_type,
+  target = EXCLUDED.target,
+  batch_size = EXCLUDED.batch_size,
+  hour_interval = EXCLUDED.hour_interval,
+  run_at_minute = EXCLUDED.run_at_minute,
+  enabled = true,
+  updated_at = pg_catalog.now();
+
+CREATE OR REPLACE FUNCTION "public"."audit_log_trigger"() RETURNS "trigger"
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    SET "search_path" TO ''
+    AS $$
+DECLARE
+  v_old_record jsonb;
+  v_new_record jsonb;
+  v_changed_fields text[];
+  v_org_id uuid;
+  v_record_id text;
+  v_user_id uuid;
+  v_key text;
+  v_api_key_text text;
+  v_api_key public.apikeys%ROWTYPE;
+  v_actor_type text := 'system';
+  v_actor_user_id uuid;
+  v_actor_user_email text;
+  v_actor_apikey_id bigint;
+  v_actor_apikey_name text;
+  v_stats_refresh_fields constant text[] := ARRAY['stats_refresh_requested_at', 'stats_updated_at', 'updated_at'];
+  v_background_counter_fields constant text[] := ARRAY['channel_device_count', 'manifest_bundle_count', 'updated_at'];
+  v_onboarding_progress_fields constant text[] := ARRAY['onboarding', 'updated_at'];
+  v_fat_app_version_fields constant text[] := ARRAY['manifest', 'native_packages'];
+BEGIN
+  SELECT auth.uid() INTO v_actor_user_id;
+
+  IF v_actor_user_id IS NOT NULL THEN
+    v_actor_type := 'user';
+  ELSE
+    SELECT public.get_apikey_header() INTO v_api_key_text;
+
+    IF v_api_key_text IS NOT NULL THEN
+      SELECT *
+      INTO v_api_key
+      FROM public.find_apikey_by_value(v_api_key_text)
+      LIMIT 1;
+
+      IF v_api_key.id IS NOT NULL
+        AND NOT public.is_apikey_expired(v_api_key.expires_at)
+        AND (
+          public.is_allowed_capgkey(v_api_key_text, '{upload}'::text[])
+          OR public.is_allowed_capgkey(v_api_key_text, '{write}'::text[])
+          OR public.is_allowed_capgkey(v_api_key_text, '{all}'::text[])
+        ) THEN
+        v_actor_type := 'apikey';
+        v_actor_user_id := v_api_key.user_id;
+        v_actor_apikey_id := v_api_key.id;
+        v_actor_apikey_name := v_api_key.name;
+      END IF;
+    END IF;
+  END IF;
+
+  IF v_actor_user_id IS NOT NULL THEN
+    SELECT users.email
+    INTO v_actor_user_email
+    FROM public.users AS users
+    WHERE users.id = v_actor_user_id;
+  END IF;
+
+  v_user_id := v_actor_user_id;
+
+  IF TG_OP = 'UPDATE' AND TG_TABLE_NAME = 'app_versions' THEN
+    v_old_record := pg_catalog.to_jsonb(OLD);
+    v_new_record := pg_catalog.to_jsonb(NEW);
+    IF (
+      v_old_record
+        - 'manifest'
+        - 'updated_at'
+        - 'manifest_count'
+        - 'storage_provider'
+        - 'r2_path'
+    ) IS NOT DISTINCT FROM (
+      v_new_record
+        - 'manifest'
+        - 'updated_at'
+        - 'manifest_count'
+        - 'storage_provider'
+        - 'r2_path'
+    ) THEN
+      RETURN NEW;
+    END IF;
+  END IF;
+
+  IF TG_OP = 'DELETE' THEN
+    v_old_record := pg_catalog.to_jsonb(OLD);
+    v_new_record := NULL;
+  ELSIF TG_OP = 'INSERT' THEN
+    v_old_record := NULL;
+    v_new_record := pg_catalog.to_jsonb(NEW);
+  ELSE
+    v_old_record := pg_catalog.to_jsonb(OLD);
+    v_new_record := pg_catalog.to_jsonb(NEW);
+
+    FOR v_key IN SELECT pg_catalog.jsonb_object_keys(v_new_record)
+    LOOP
+      IF v_old_record->v_key IS DISTINCT FROM v_new_record->v_key THEN
+        v_changed_fields := pg_catalog.array_append(v_changed_fields, v_key);
+      END IF;
+    END LOOP;
+
+    IF v_changed_fields IS NOT NULL
+      AND NOT EXISTS (
+        SELECT 1
+        FROM pg_catalog.unnest(v_changed_fields) AS changed_field(field_name)
+        WHERE changed_field.field_name IS DISTINCT FROM 'updated_at'
+      ) THEN
+      RETURN NEW;
+    END IF;
+
+    IF TG_TABLE_NAME = ANY(ARRAY['apps', 'orgs'])
+      AND v_changed_fields && ARRAY['stats_refresh_requested_at', 'stats_updated_at']
+      AND NOT EXISTS (
+        SELECT 1
+        FROM pg_catalog.unnest(v_changed_fields) AS changed_field(field_name)
+        WHERE changed_field.field_name <> ALL(v_stats_refresh_fields)
+      ) THEN
+      RETURN NEW;
+    END IF;
+
+    IF v_actor_type = 'system'
+      AND TG_TABLE_NAME = 'apps'
+      AND v_changed_fields && ARRAY['channel_device_count', 'manifest_bundle_count']
+      AND NOT EXISTS (
+        SELECT 1
+        FROM pg_catalog.unnest(v_changed_fields) AS changed_field(field_name)
+        WHERE changed_field.field_name <> ALL(v_background_counter_fields)
+      ) THEN
+      RETURN NEW;
+    END IF;
+
+    IF TG_TABLE_NAME = 'apps'
+      AND v_changed_fields && ARRAY['onboarding']
+      AND NOT EXISTS (
+        SELECT 1
+        FROM pg_catalog.unnest(v_changed_fields) AS changed_field(field_name)
+        WHERE changed_field.field_name <> ALL(v_onboarding_progress_fields)
+      ) THEN
+      RETURN NEW;
+    END IF;
+  END IF;
+
+  IF TG_TABLE_NAME = 'app_versions' THEN
+    IF v_old_record IS NOT NULL THEN
+      v_old_record := v_old_record - v_fat_app_version_fields;
+    END IF;
+    IF v_new_record IS NOT NULL THEN
+      v_new_record := v_new_record - v_fat_app_version_fields;
+    END IF;
+  END IF;
+
+  IF TG_OP = 'DELETE' THEN
+    CASE TG_TABLE_NAME
+      WHEN 'orgs' THEN
+        v_org_id := OLD.id;
+        v_record_id := OLD.id::text;
+      WHEN 'apps' THEN
+        v_org_id := OLD.owner_org;
+        v_record_id := OLD.app_id::text;
+      WHEN 'channels' THEN
+        v_org_id := OLD.owner_org;
+        v_record_id := OLD.id::text;
+      WHEN 'app_versions' THEN
+        v_org_id := OLD.owner_org;
+        v_record_id := OLD.id::text;
+      WHEN 'org_users' THEN
+        v_org_id := OLD.org_id;
+        v_record_id := OLD.id::text;
+      ELSE
+        v_org_id := NULL;
+        v_record_id := NULL;
+    END CASE;
+  ELSE
+    CASE TG_TABLE_NAME
+      WHEN 'orgs' THEN
+        v_org_id := NEW.id;
+        v_record_id := NEW.id::text;
+      WHEN 'apps' THEN
+        v_org_id := NEW.owner_org;
+        v_record_id := NEW.app_id::text;
+      WHEN 'channels' THEN
+        v_org_id := NEW.owner_org;
+        v_record_id := NEW.id::text;
+      WHEN 'app_versions' THEN
+        v_org_id := NEW.owner_org;
+        v_record_id := NEW.id::text;
+      WHEN 'org_users' THEN
+        v_org_id := NEW.org_id;
+        v_record_id := NEW.id::text;
+      ELSE
+        v_org_id := NULL;
+        v_record_id := NULL;
+    END CASE;
+  END IF;
+
+  IF v_org_id IS NOT NULL THEN
+    INSERT INTO public.audit_logs (
+      table_name,
+      record_id,
+      operation,
+      user_id,
+      org_id,
+      old_record,
+      new_record,
+      changed_fields,
+      actor_type,
+      actor_user_id,
+      actor_user_email,
+      actor_apikey_id,
+      actor_apikey_name
+    ) VALUES (
+      TG_TABLE_NAME,
+      v_record_id,
+      TG_OP,
+      v_user_id,
+      v_org_id,
+      v_old_record,
+      v_new_record,
+      v_changed_fields,
+      v_actor_type,
+      v_actor_user_id,
+      v_actor_user_email,
+      v_actor_apikey_id,
+      v_actor_apikey_name
+    );
+  END IF;
+
+  IF TG_OP = 'DELETE' THEN
+    RETURN OLD;
+  END IF;
+
+  RETURN NEW;
+END;
+$$;
+
+ALTER FUNCTION "public"."audit_log_trigger"() OWNER TO "postgres";
diff --git a/tests/app-onboarding-progress-integration.unit.test.ts b/tests/app-onboarding-progress-integration.unit.test.ts
index 8cb076f416..3040a03f6a 100644
--- a/tests/app-onboarding-progress-integration.unit.test.ts
+++ b/tests/app-onboarding-progress-integration.unit.test.ts
@@ -84,11 +84,13 @@ describe('app onboarding progress analytics integration', () => {
     expect(demoAction).not.toContain('completeStep')
     expect(demoAction).not.toContain('completeAndViewStep')
     expect(demoAction).toContain('allowOnboardingDashboardExploration')
+    expect(demoAction).toContain('/getting-started')
 
     const dashboardExit = sourceBetween('function openDashboard()', 'onMounted(async () => {')
     expect(dashboardExit).toContain("if (flowStep.value === 'install' || flowStep.value === 'setup')")
     expect(dashboardExit).toContain('progressTracker?.completeStep(flowStep.value, {')
     expect(dashboardExit).toContain('appId: createdApp.value.app_id')
+    expect(dashboardExit).toContain('/getting-started')
     expect(dashboardExit.indexOf('completeStep')).toBeLessThan(dashboardExit.indexOf('router.push'))
   })
 })
diff --git a/tests/app-onboarding-progress.test.ts b/tests/app-onboarding-progress.test.ts
new file mode 100644
index 0000000000..46f3b5ef46
--- /dev/null
+++ b/tests/app-onboarding-progress.test.ts
@@ -0,0 +1,227 @@
+import type { Database } from '~/types/supabase.types'
+import { randomUUID } from 'node:crypto'
+import { createClient } from '@supabase/supabase-js'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { parseAppOnboardingLedger } from '../src/utils/appOnboardingProgress.ts'
+import {
+  executeSQL,
+  getSupabaseClient,
+  ORG_ID,
+  SUPABASE_ANON_KEY,
+  SUPABASE_BASE_URL,
+  USER_EMAIL,
+  USER_ID,
+  USER_PASSWORD,
+} from './test-utils.ts'
+
+const APP_RPC = `ob.rpc.${randomUUID().slice(0, 8)}`
+const APP_INSERT = `ob.ins.${randomUUID().slice(0, 8)}`
+const APP_TESTFLIGHT = `ob.tf.${randomUUID().slice(0, 8)}`
+const APP_STORE = `ob.st.${randomUUID().slice(0, 8)}`
+const DEVICE_TF = randomUUID().toLowerCase()
+const DEVICE_STORE = randomUUID().toLowerCase()
+
+const serviceRoleSupabase = getSupabaseClient()
+
+function createAuthClient() {
+  return createClient<Database>(SUPABASE_BASE_URL, SUPABASE_ANON_KEY, {
+    auth: {
+      persistSession: false,
+      autoRefreshToken: false,
+      detectSessionInUrl: false,
+    },
+  })
+}
+
+async function createApp(appId: string) {
+  const { error } = await serviceRoleSupabase.from('apps').insert({
+    app_id: appId,
+    owner_org: ORG_ID,
+    name: 'Onboarding progress test app',
+    icon_url: 'https://example.com/icon.png',
+  })
+  if (error)
+    throw error
+}
+
+async function insertDevice(appId: string, deviceId: string, installSource: string) {
+  const { error } = await serviceRoleSupabase.from('devices').insert({
+    app_id: appId,
+    device_id: deviceId,
+    platform: 'ios',
+    plugin_version: '7.0.0',
+    updated_at: new Date().toISOString(),
+    version_name: '1.0.0',
+    install_source: installSource,
+    is_prod: true,
+    is_emulator: false,
+  })
+  if (error)
+    throw error
+}
+
+async function refreshUntil(appId: string) {
+  for (let attempt = 0; attempt < 40; attempt++) {
+    await executeSQL('SELECT public.refresh_app_onboarding_progress(500)')
+    const { data, error } = await serviceRoleSupabase
+      .from('apps')
+      .select('onboarding')
+      .eq('app_id', appId)
+      .single()
+    if (error)
+      throw error
+    const ledger = parseAppOnboardingLedger(data.onboarding)
+    if (ledger.refreshed_at)
+      return ledger
+  }
+  throw new Error(`refresh_app_onboarding_progress never reached ${appId}`)
+}
+
+beforeAll(async () => {
+  await createApp(APP_RPC)
+  await createApp(APP_TESTFLIGHT)
+  await createApp(APP_STORE)
+  await insertDevice(APP_TESTFLIGHT, DEVICE_TF, 'testflight')
+  await insertDevice(APP_STORE, DEVICE_STORE, 'app_store')
+})
+
+afterAll(async () => {
+  await serviceRoleSupabase.from('devices').delete().eq('app_id', APP_TESTFLIGHT)
+  await serviceRoleSupabase.from('devices').delete().eq('app_id', APP_STORE)
+  await serviceRoleSupabase.from('apps').delete().in('app_id', [APP_RPC, APP_INSERT, APP_TESTFLIGHT, APP_STORE])
+})
+
+describe('app onboarding progress RPCs', () => {
+  it('must reject unauthenticated mark_onboarding_feature_started', async () => {
+    const anon = createAuthClient()
+    const { error } = await anon.rpc('mark_onboarding_feature_started', {
+      p_app_id: APP_RPC,
+      p_feature_key: 'cli_install',
+    })
+    expect(error).toBeTruthy()
+  })
+
+  it('sets started_at and persists it', async () => {
+    const authClient = createAuthClient()
+    const { error: signInError } = await authClient.auth.signInWithPassword({
+      email: USER_EMAIL,
+      password: USER_PASSWORD,
+    })
+    if (signInError)
+      throw signInError
+
+    const { data, error } = await authClient.rpc('mark_onboarding_feature_started', {
+      p_app_id: APP_RPC,
+      p_feature_key: 'cli_install',
+    })
+    expect(error).toBeNull()
+    const ledger = parseAppOnboardingLedger(data)
+    expect(ledger.features?.cli_install?.started_at).toBeTruthy()
+    expect(ledger.features?.cli_install?.succeeded_at).toBeFalsy()
+    expect(ledger.features?.cli_install?.stage).toBeFalsy()
+
+    const { data: persisted, error: readError } = await serviceRoleSupabase
+      .from('apps')
+      .select('onboarding')
+      .eq('app_id', APP_RPC)
+      .single()
+    expect(readError).toBeNull()
+    const persistedLedger = parseAppOnboardingLedger(persisted?.onboarding)
+    expect(persistedLedger.features?.cli_install?.started_at).toBeTruthy()
+    expect(persistedLedger.features?.cli_install?.succeeded_at).toBeFalsy()
+  })
+
+  it('rejects direct authenticated writes to apps.onboarding', async () => {
+    const authClient = createAuthClient()
+    const { error: signInError } = await authClient.auth.signInWithPassword({
+      email: USER_EMAIL,
+      password: USER_PASSWORD,
+    })
+    if (signInError)
+      throw signInError
+
+    const { error: _updateError } = await authClient
+      .from('apps')
+      .update({
+        onboarding: {
+          features: {
+            ota: {
+              succeeded_at: '2026-01-01T00:00:00.000Z',
+              stage: 'store_live',
+            },
+          },
+        },
+      })
+      .eq('app_id', APP_RPC)
+
+    const { data, error: readError } = await serviceRoleSupabase
+      .from('apps')
+      .select('onboarding')
+      .eq('app_id', APP_RPC)
+      .single()
+    expect(readError).toBeNull()
+    const ledger = parseAppOnboardingLedger(data?.onboarding)
+    expect(ledger.features?.ota?.succeeded_at).toBeFalsy()
+    expect(ledger.features?.ota?.stage).not.toBe('store_live')
+    expect(ledger.features?.cli_install?.started_at).toBeTruthy()
+  })
+
+  it('clears forged onboarding on authenticated insert', async () => {
+    const authClient = createAuthClient()
+    const { error: signInError } = await authClient.auth.signInWithPassword({
+      email: USER_EMAIL,
+      password: USER_PASSWORD,
+    })
+    if (signInError)
+      throw signInError
+
+    const { error: insertError } = await authClient.from('apps').insert({
+      app_id: APP_INSERT,
+      owner_org: ORG_ID,
+      user_id: USER_ID,
+      name: 'Onboarding insert protection test app',
+      icon_url: 'https://example.com/icon.png',
+      onboarding: {
+        features: {
+          ota: {
+            succeeded_at: '2026-01-01T00:00:00.000Z',
+            stage: 'store_live',
+          },
+        },
+      },
+    })
+    expect(insertError, JSON.stringify(insertError)).toBeNull()
+
+    const { data, error: readError } = await serviceRoleSupabase
+      .from('apps')
+      .select('onboarding')
+      .eq('app_id', APP_INSERT)
+      .single()
+    expect(readError).toBeNull()
+    expect(data).toBeTruthy()
+    const ledger = parseAppOnboardingLedger(data?.onboarding)
+    expect(ledger.features?.ota?.succeeded_at).toBeFalsy()
+    expect(ledger.features?.ota?.stage).not.toBe('store_live')
+  })
+
+  it('keeps TestFlight-only apps off store_live', async () => {
+    const defs = await executeSQL<{ def: string }>(
+      `SELECT pg_get_functiondef('public.refresh_app_onboarding_progress(integer)'::regprocedure) AS def`,
+    )
+    expect(defs[0]?.def).toContain('INNER JOIN batch ON batch.app_id')
+
+    const testflight = await refreshUntil(APP_TESTFLIGHT)
+    const store = await refreshUntil(APP_STORE)
+
+    expect(testflight.features?.ota?.stage).toBe('testflight')
+    expect(testflight.features?.ota?.stage).not.toBe('store_live')
+    expect(store.features?.ota?.stage).toBe('store_live')
+
+    const merged = await executeSQL<{ stage: string | null }>(
+      `SELECT public.merge_app_onboarding_feature(
+         '{"stage":"store_live"}'::jsonb, NULL, NULL, NULL, 'no_device'
+       )->>'stage' AS stage`,
+    )
+    expect(merged[0]?.stage).toBe('store_live')
+  })
+})
diff --git a/tests/app-onboarding-progress.unit.test.ts b/tests/app-onboarding-progress.unit.test.ts
new file mode 100644
index 0000000000..906ffa769d
--- /dev/null
+++ b/tests/app-onboarding-progress.unit.test.ts
@@ -0,0 +1,195 @@
+import { describe, expect, it } from 'vitest'
+import {
+  buildGettingStartedSteps,
+  getAppOnboardingFeature,
+  gettingStartedProgress,
+  highestAppOnboardingStage,
+  isFeatureRetained30d,
+  isFeatureUsedSince,
+  nextOnboardingAction,
+  onboardingNextStepMessageKeys,
+  parseAppOnboardingLedger,
+  parseAppOnboardingStage,
+  rankAppOnboardingStage,
+  shouldShowGettingStartedNav,
+  shouldShowOnboardingNextStep,
+} from '../src/utils/appOnboardingProgress.ts'
+import {
+  gettingStartedDismissedKey,
+  gettingStartedDismissedLegacyKey,
+  parseDismissedGettingStartedAppIds,
+  serializeDismissedGettingStartedAppIds,
+} from '../src/utils/gettingStartedDismiss.ts'
+
+describe('app onboarding progress ledger', () => {
+  it.concurrent('parses feature timestamps and ignores unknown stages', () => {
+    const ledger = parseAppOnboardingLedger({
+      refreshed_at: '2026-08-13T00:00:00.000Z',
+      features: {
+        ota: {
+          started_at: '2026-08-01T00:00:00.000Z',
+          stage: 'testflight',
+        },
+        cli_install: {
+          succeeded_at: '2026-08-02T00:00:00.000Z',
+          stage: 'not-a-stage',
+        },
+      },
+    })
+
+    expect(ledger.features?.ota?.stage).toBe('testflight')
+    expect(ledger.features?.cli_install?.succeeded_at).toBe('2026-08-02T00:00:00.000Z')
+    expect(ledger.features?.cli_install?.stage).toBeNull()
+    expect(parseAppOnboardingStage('store_live')).toBe('store_live')
+    expect(parseAppOnboardingStage('production')).toBeNull()
+  })
+
+  it.concurrent('ranks store_live above testflight and empty', () => {
+    expect(rankAppOnboardingStage('store_live')).toBeGreaterThan(rankAppOnboardingStage('testflight'))
+    expect(highestAppOnboardingStage(['testflight', 'no_device', 'store_live'])).toBe('store_live')
+    expect(highestAppOnboardingStage([null, 'testflight'])).toBe('testflight')
+    expect(highestAppOnboardingStage([])).toBeNull()
+  })
+
+  it.concurrent('does not treat is_prod-only apps as store live', () => {
+    const feature = getAppOnboardingFeature({
+      features: { ota: { stage: 'native_unknown' } },
+    }, 'ota')
+    expect(feature.stage).toBe('native_unknown')
+    expect(feature.stage).not.toBe('store_live')
+  })
+
+  it.concurrent('sets retained_30d from stored timestamp, not from last_used alone', () => {
+    expect(isFeatureRetained30d({
+      succeeded_at: '2026-07-01T00:00:00.000Z',
+      last_used_at: '2026-08-10T00:00:00.000Z',
+    })).toBe(false)
+    expect(isFeatureRetained30d({
+      retained_30d_at: '2026-08-01T00:00:00.000Z',
+    })).toBe(true)
+  })
+
+  it.concurrent('detects current quarter usage from last_used_at', () => {
+    const now = Date.parse('2026-08-13T00:00:00.000Z')
+    expect(isFeatureUsedSince({ last_used_at: '2026-07-01T00:00:00.000Z' }, 90 * 24 * 60 * 60 * 1000, now)).toBe(true)
+    expect(isFeatureUsedSince({ last_used_at: '2026-04-01T00:00:00.000Z' }, 90 * 24 * 60 * 60 * 1000, now)).toBe(false)
+  })
+
+  it.concurrent('routes next action by distribution stage after CLI install', () => {
+    expect(nextOnboardingAction({}).feature).toBe('cli_install')
+    expect(nextOnboardingAction({
+      features: {
+        cli_install: { started_at: '2026-08-01T00:00:00.000Z' },
+        ota: { stage: 'no_device' },
+      },
+    })).toEqual({ feature: 'cli_install', stage: 'no_device' })
+    expect(nextOnboardingAction({
+      features: {
+        cli_install: { started_at: '2026-08-01T00:00:00.000Z', succeeded_at: '2026-08-02T00:00:00.000Z' },
+        ota: { started_at: '2026-08-03T00:00:00.000Z', stage: 'testflight' },
+      },
+    })).toEqual({ feature: 'ota', stage: 'testflight' })
+    expect(nextOnboardingAction({
+      features: {
+        cli_install: { started_at: '2026-08-01T00:00:00.000Z', succeeded_at: '2026-08-02T00:00:00.000Z' },
+        ota: {
+          started_at: '2026-08-03T00:00:00.000Z',
+          succeeded_at: '2026-08-04T00:00:00.000Z',
+          stage: 'store_live',
+        },
+      },
+    })).toEqual({ feature: 'ota', stage: 'store_live' })
+    expect(nextOnboardingAction({
+      features: {
+        builder: { started_at: '2026-08-01T00:00:00.000Z' },
+      },
+    })).toEqual({ feature: 'builder', stage: 'no_device' })
+    expect(nextOnboardingAction({
+      features: {
+        cli_install: { started_at: '2026-08-01T00:00:00.000Z', succeeded_at: '2026-08-02T00:00:00.000Z' },
+        ota: { stage: 'play_unknown' },
+        builder: { started_at: '2026-08-03T00:00:00.000Z' },
+      },
+    }).feature).toBe('builder')
+    expect(onboardingNextStepMessageKeys({
+      features: { builder: { started_at: '2026-08-01T00:00:00.000Z' } },
+    })).toEqual({
+      titleKey: 'onboarding-next-builder',
+      descKey: 'onboarding-next-builder-desc',
+    })
+  })
+
+  it.concurrent('hides next-step card once store live is reached', () => {
+    expect(shouldShowOnboardingNextStep({})).toBe(true)
+    expect(shouldShowOnboardingNextStep({
+      features: {
+        cli_install: { started_at: '2026-08-01T00:00:00.000Z', succeeded_at: '2026-08-02T00:00:00.000Z' },
+        ota: { started_at: '2026-08-03T00:00:00.000Z', succeeded_at: '2026-08-04T00:00:00.000Z', stage: 'store_live' },
+      },
+    })).toBe(false)
+  })
+
+  it.concurrent('builds getting started checklist from ledger stages', () => {
+    const empty = buildGettingStartedSteps({})
+    expect(empty.every(step => !step.done)).toBe(true)
+    expect(shouldShowGettingStartedNav({})).toBe(true)
+    expect(gettingStartedProgress(empty)).toEqual({ done: 0, total: 4, percent: 0 })
+
+    const live = buildGettingStartedSteps({
+      features: {
+        cli_install: { succeeded_at: '2026-08-02T00:00:00.000Z' },
+        ota: { started_at: '2026-08-03T00:00:00.000Z', succeeded_at: '2026-08-04T00:00:00.000Z', stage: 'store_live' },
+        builder: { succeeded_at: '2026-08-05T00:00:00.000Z' },
+      },
+    })
+    expect(live.every(step => step.done)).toBe(true)
+    expect(shouldShowGettingStartedNav({
+      features: {
+        ota: { succeeded_at: '2026-08-04T00:00:00.000Z', stage: 'store_live' },
+      },
+    })).toBe(false)
+    expect(gettingStartedProgress(live).percent).toBe(100)
+  })
+
+  it.concurrent('marks builder done from extras without keeping the sidebar entry', () => {
+    const steps = buildGettingStartedSteps({
+      features: {
+        cli_install: { succeeded_at: '2026-08-02T00:00:00.000Z' },
+        ota: { stage: 'store_live' },
+      },
+    }, { builderDone: true })
+    expect(steps.find(step => step.id === 'builder')?.done).toBe(true)
+    expect(shouldShowGettingStartedNav({
+      features: {
+        cli_install: { succeeded_at: '2026-08-02T00:00:00.000Z' },
+        ota: { succeeded_at: '2026-08-04T00:00:00.000Z', stage: 'store_live' },
+      },
+    })).toBe(false)
+  })
+
+  it.concurrent('does not mark live_update done from a device stage alone', () => {
+    const steps = buildGettingStartedSteps({
+      features: {
+        cli_install: { succeeded_at: '2026-08-02T00:00:00.000Z' },
+        ota: { stage: 'native_unknown' },
+      },
+    })
+    expect(steps.find(step => step.id === 'cli_install')?.done).toBe(true)
+    expect(steps.find(step => step.id === 'live_update')?.done).toBe(false)
+    expect(steps.find(step => step.id === 'store_release')?.done).toBe(false)
+  })
+})
+
+describe('getting started dismiss storage', () => {
+  it.concurrent('parses and serializes dismissed app ids', () => {
+    expect(parseDismissedGettingStartedAppIds(null).size).toBe(0)
+    expect(parseDismissedGettingStartedAppIds('not-json').size).toBe(0)
+    expect([...parseDismissedGettingStartedAppIds('["com.demo.app",""]')]).toEqual(['com.demo.app'])
+    expect(serializeDismissedGettingStartedAppIds(['com.a.app', 'com.a.app'])).toBe('["com.a.app"]')
+  })
+
+  it.concurrent('uses a per-app dismiss key', () => {
+    expect(gettingStartedDismissedKey('user-1', 'com.demo.app')).toBe('capgo.gettingStarted.dismissed.user-1.com.demo.app')
+    expect(gettingStartedDismissedLegacyKey('user-1')).toBe('capgo.gettingStarted.dismissed.user-1')
+  })
+})
diff --git a/tests/display-app-name-cache.unit.test.ts b/tests/display-app-name-cache.unit.test.ts
index 3bee7d3f23..d1867ac87d 100644
--- a/tests/display-app-name-cache.unit.test.ts
+++ b/tests/display-app-name-cache.unit.test.ts
@@ -120,4 +120,14 @@ describe('display app-name lookups', () => {
 
     expect(mockFrom).not.toHaveBeenCalled()
   })
+
+  it('keeps Getting Started out of the in-app breadcrumb trail', async () => {
+    const { useDisplayStore } = await import('../src/stores/display.ts')
+    const display = useDisplayStore()
+
+    display.updatePathTitle('/app/com.demo.app/getting-started')
+
+    expect(display.pathTitle).toEqual([])
+    expect(mockFrom).not.toHaveBeenCalled()
+  })
 })