[codex] Add actor-scoped tracking payloads

cli/src/ai/telemetry.ts

@@ -37,7 +37,8 @@ export async function trackAiAnalysisChoice(input: TrackAiAnalysisChoiceInput):
       channel: 'build-lifecycle',
       icon: '🤖',
       notify: false,
-      user_id: input.orgId,
+      org_id: input.orgId,
+      tracking_version: 2,
       tags: {
         app_id: input.appId,
         platform: input.platform,
@@ -76,7 +77,8 @@ export async function trackAiAnalysisResult(input: TrackAiAnalysisResultInput):
       channel: 'build-lifecycle',
       icon: '🤖',
       notify: false,
-      user_id: input.orgId,
+      org_id: input.orgId,
+      tracking_version: 2,
       tags,
     })
   }

cli/src/build/credentials-command.ts

@@ -488,7 +488,8 @@ export async function saveCredentialsCommand(options: SaveCredentialsOptions): P
           channel: 'credentials',
           event: 'Credentials saved',
           icon: '🔐',
-          user_id: orgId,
+          org_id: orgId,
+          tracking_version: 2,
           tags: {
             'app-id': appId,
             'platform': platform,

cli/src/build/onboarding/telemetry.ts

@@ -56,7 +56,8 @@ export async function trackBuilderOnboardingStep(input: TrackBuilderOnboardingSt
       channel: 'builder-onboarding',
       icon: '🧭',
       notify: false,
-      user_id: input.orgId,
+      org_id: input.orgId,
+      tracking_version: 2,
       tags,
     })
   }
@@ -83,7 +84,8 @@ export async function trackBuilderOnboardingAction(input: TrackBuilderOnboarding
       channel: 'builder-onboarding',
       icon: '🧭',
       notify: false,
-      user_id: input.orgId,
+      org_id: input.orgId,
+      tracking_version: 2,
       tags,
     })
   }

cli/src/build/request.ts

@@ -1658,7 +1658,8 @@ export async function requestBuildInternal(appId: string, options: BuildRequestO
       channel: 'native-builder',
       event: 'Build requested',
       icon: '🏗️',
-      user_id: orgId,
+      org_id: orgId,
+      tracking_version: 2,
       tags: {
         'app-id': appId,
         'platform': platform,
@@ -2165,7 +2166,8 @@ export async function requestBuildInternal(appId: string, options: BuildRequestO
         channel: 'native-builder',
         event: finalStatus === 'succeeded' ? 'Build succeeded' : 'Build failed',
         icon: finalStatus === 'succeeded' ? '✅' : '❌',
-        user_id: orgId,
+        org_id: orgId,
+        tracking_version: 2,
         tags: {
           'app-id': appId,
           'platform': platform,

cli/src/build/telemetry.ts

@@ -79,7 +79,8 @@ export async function trackBuilderUpload(input: TrackBuilderUploadInput): Promis
       channel: 'build-lifecycle',
       icon: ICON_BY_PHASE[input.phase],
       notify: false,
-      user_id: input.orgId,
+      org_id: input.orgId,
+      tracking_version: 2,
       tags,
     })
   }

cli/src/utils.ts

@@ -158,6 +158,14 @@ interface TrackOptions {
    * example: "user-123"
    */
   user_id?: string
+  /**
+   * Organization ID for actor-scoped tracking.
+   */
+  org_id?: string
+  /**
+   * Tracking payload contract version.
+   */
+  tracking_version?: number
   /**
    * Event icon (emoji)
    * must be a single emoji

cli/test/test-onboarding-telemetry.mjs

@@ -47,7 +47,8 @@ try {
   assert.equal(body.event, 'Builder Onboarding Action')
   assert.equal(body.channel, 'builder-onboarding')
   assert.equal(body.notify, false)
-  assert.equal(body.user_id, 'org-id')
+  assert.equal(body.org_id, 'org-id')
+  assert.equal(body.tracking_version, 2)
   assert.deepEqual(body.tags, {
     accepted: 'true',
     action: 'android_sa_method_selected',

src/components/dashboard/DemoOnboardingModal.vue

@@ -184,15 +184,19 @@ const confettiTimer = ref<number | null>(null)
 const timers = ref<number[]>([])
 
 function trackNoAppDemoEvent(event: string, tags: Record<string, string | number | boolean> = {}) {
-  sendEvent({
-    channel: 'demo-onboarding',
-    event,
-    icon: '🧪',
-    user_id: organizationStore.currentOrganization?.gid,
-    notify: false,
-    tags,
-  }).catch()
-  pushEvent(`user:${event}`, config.supaHost)
+  const orgId = organizationStore.currentOrganization?.gid
+  if (orgId) {
+    sendEvent({
+      channel: 'demo-onboarding',
+      event,
+      icon: '🧪',
+      org_id: orgId,
+      tracking_version: 2,
+      notify: false,
+      tags,
+    }).catch()
+    pushEvent(`user:${event}`, config.supaHost, { org_id: orgId })
+  }
 }
 
 function trackNoAppDemoStepEvent(stepId: DemoStep | 'global', action: string, tags: Record<string, string | number | boolean> = {}) {

src/components/dashboard/InviteTeammateModal.vue

@@ -174,13 +174,17 @@ function completeInviteSuccess(payload: InviteSuccessPayload) {
   isEmailDialogOpen.value = false
   isFullDetailsDialogOpen.value = false
   emit('success', payload)
-  sendEvent({
-    channel: 'onboarding-v2',
-    event: `onboarding-step-invite-teammate`,
-    icon: '👥',
-    user_id: organizationStore.currentOrganization?.gid,
-    notify: false,
-  }).catch()
+  const orgId = organizationStore.currentOrganization?.gid
+  if (orgId) {
+    sendEvent({
+      channel: 'onboarding-v2',
+      event: `onboarding-step-invite-teammate`,
+      icon: '👥',
+      org_id: orgId,
+      tracking_version: 2,
+      notify: false,
+    }).catch()
+  }
 }
 
 async function handleEmailSubmit() {

src/components/dashboard/StepsApp.vue

@@ -84,14 +84,18 @@ function stepToName(stepNumber: number): string {
 
 function setLog() {
   if (props.onboarding && main.user?.id) {
-    sendEvent({
-      channel: 'onboarding-v2',
-      event: `onboarding-step-${stepToName(step.value)}`,
-      icon: '👶',
-      user_id: organizationStore.currentOrganization?.gid,
-      notify: false,
-    }).catch()
-    pushEvent(`user:onboarding-step-${stepToName(step.value)}`, config.supaHost)
+    const orgId = organizationStore.currentOrganization?.gid
+    if (orgId) {
+      sendEvent({
+        channel: 'onboarding-v2',
+        event: `onboarding-step-${stepToName(step.value)}`,
+        icon: '👶',
+        org_id: orgId,
+        tracking_version: 2,
+        notify: false,
+      }).catch()
+      pushEvent(`user:onboarding-step-${stepToName(step.value)}`, config.supaHost, { org_id: orgId })
+    }
   }
   if (step.value === 2) {
     console.log('Finished onboarding for app ID:', appId.value)
@@ -121,14 +125,18 @@ function goToNextStep(scrollTargetId?: string) {
 
 function openInviteDialog() {
   inviteModalRef.value?.openDialog()
-  sendEvent({
-    channel: 'onboarding-v2',
-    event: `onboarding-alternative-send-invite`,
-    icon: '👶',
-    user_id: organizationStore.currentOrganization?.gid,
-    notify: false,
-  }).catch()
-  pushEvent(`user:onboarding-alternative-send-invite`, config.supaHost)
+  const orgId = organizationStore.currentOrganization?.gid
+  if (orgId) {
+    sendEvent({
+      channel: 'onboarding-v2',
+      event: `onboarding-alternative-send-invite`,
+      icon: '👶',
+      org_id: orgId,
+      tracking_version: 2,
+      notify: false,
+    }).catch()
+    pushEvent(`user:onboarding-alternative-send-invite`, config.supaHost, { org_id: orgId })
+  }
 }
 
 function onInviteSuccess() {
@@ -153,10 +161,11 @@ async function createDemoApp() {
       channel: 'onboarding-v2',
       event: 'onboarding-create-demo-app',
       icon: '👶',
-      user_id: orgId,
+      org_id: orgId,
+      tracking_version: 2,
       notify: false,
     }).catch()
-    pushEvent('user:onboarding-create-demo-app', config.supaHost)
+    pushEvent('user:onboarding-create-demo-app', config.supaHost, { org_id: orgId })
 
     const { data, error } = await supabase.functions.invoke('app/demo', {
       method: 'POST',

src/components/dashboard/StepsBuild.vue

@@ -141,14 +141,18 @@ function stepToName(stepNumber: number): string {
 
 function setLog() {
   if (initialOnboarding && main.user?.id) {
-    sendEvent({
-      channel: 'onboarding-build',
-      event: `onboarding-build-step-${stepToName(step.value)}`,
-      icon: 'build',
-      user_id: organizationStore.currentOrganization?.gid,
-      notify: false,
-    }).catch()
-    pushEvent(`user:onboarding-build-${stepToName(step.value)}`, config.supaHost)
+    const orgId = organizationStore.currentOrganization?.gid
+    if (orgId) {
+      sendEvent({
+        channel: 'onboarding-build',
+        event: `onboarding-build-step-${stepToName(step.value)}`,
+        icon: 'build',
+        org_id: orgId,
+        tracking_version: 2,
+        notify: false,
+      }).catch()
+      pushEvent(`user:onboarding-build-${stepToName(step.value)}`, config.supaHost, { org_id: orgId })
+    }
   }
   if (step.value === completedStepIndex.value) {
     emit('done')

src/components/dashboard/StepsBundle.vue

@@ -71,14 +71,18 @@ function stepToName(stepNumber: number): string {
 function setLog() {
   console.log('setLog', props.onboarding, main.user?.id, step.value)
   if (props.onboarding && main.user?.id) {
-    sendEvent({
-      channel: 'onboarding-bundle',
-      event: `onboarding-bundle-step-${stepToName(step.value)}`,
-      icon: '👶',
-      user_id: organizationStore.currentOrganization?.gid,
-      notify: false,
-    }).catch()
-    pushEvent(`user:onboarding-bundle-${stepToName(step.value)}`, config.supaHost)
+    const orgId = organizationStore.currentOrganization?.gid
+    if (orgId) {
+      sendEvent({
+        channel: 'onboarding-bundle',
+        event: `onboarding-bundle-step-${stepToName(step.value)}`,
+        icon: '👶',
+        org_id: orgId,
+        tracking_version: 2,
+        notify: false,
+      }).catch()
+      pushEvent(`user:onboarding-bundle-${stepToName(step.value)}`, config.supaHost, { org_id: orgId })
+    }
   }
   if (step.value === 2) {
     emit('done')

src/components/dashboard/TrialBanner.vue

@@ -36,6 +36,7 @@ const config = getLocalConfig()
 function trackBannerEvent(eventName: string) {
   const org = currentOrg.value
   pushEvent(eventName, config.supaHost, {
+    ...(org?.gid ? { org_id: org.gid } : {}),
     trial_days_left: org?.trial_left ?? 0,
     org_gid: org?.gid ?? '',
   })

src/pages/settings/organization/Plans.vue

@@ -369,13 +369,17 @@ watchEffect(async () => {
       }
 
       loadData(true)
-      sendEvent({
-        channel: 'usage',
-        event: 'User visit',
-        icon: '💳',
-        user_id: currentOrganization.value?.gid,
-        notify: false,
-      }).catch()
+      const orgId = currentOrganization.value?.gid
+      if (orgId) {
+        sendEvent({
+          channel: 'usage',
+          event: 'User visit',
+          icon: '💳',
+          org_id: orgId,
+          tracking_version: 2,
+          notify: false,
+        }).catch()
+      }
     }
   }
 })

src/pages/settings/organization/Usage.vue

@@ -39,13 +39,17 @@ watchEffect(async () => {
       toast.success(t('usage-success'))
     }
     else if (main.user?.id) {
-      sendEvent({
-        channel: 'usage',
-        event: 'User visit',
-        icon: '💳',
-        user_id: currentOrganization.value?.gid,
-        notify: false,
-      }).catch()
+      const orgId = currentOrganization.value?.gid
+      if (orgId) {
+        sendEvent({
+          channel: 'usage',
+          event: 'User visit',
+          icon: '💳',
+          org_id: orgId,
+          tracking_version: 2,
+          notify: false,
+        }).catch()
+      }
     }
   }
 })

src/services/tracking.ts

@@ -28,6 +28,14 @@ interface TrackOptions {
    * example: "user-123"
    */
   user_id?: string
+  /**
+   * Organization ID for actor-scoped tracking.
+   */
+  org_id?: string
+  /**
+   * Tracking payload contract version.
+   */
+  tracking_version?: number
   /**
    * Event icon (emoji)
    * must be a single emoji