feat: move HealthKit permission to onboarding, remove HR write

- Add .health step to onboarding between frequency and ready - HealthStep with non-blocking permission flow (Not Now skips) - Remove requestAuthorization() from PlayerViewModel.startWorkout() - Guard live session start with isAuthorized check - Remove heart rate write from HealthKit authorization popup - Remove HR sample writing from saveWorkout (now without permission) - Add L10n keys: healthAccess, healthAccessSubtitle, allowHealthAccess, notNow - Add EN/DE/ES/FR translations - Track permission decisions through analytics - Entry animation on HealthStep (fade-in + slide-up) HealthKit permission is now asked once during onboarding, never interrupting workouts again.
chore: update .gitignore.
2026-05-24 15:18:11 +02:00 · 2026-05-23 12:29:54 +02:00 · 2026-05-23 12:24:34 +02:00 · 2026-05-23 12:09:28 +02:00
10 changed files with 330 additions and 254 deletions
--- a/.github/workflows/app-store.yml
+++ b/.github/workflows/app-store.yml
@@ -1,82 +0,0 @@
-name: App Store Submission
-
-on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
-
-jobs:
-  upload-to-app-store:
-    name: Archive & Upload to App Store
-    runs-on: macos-15
-    timeout-minutes: 60
-    defaults:
-      run:
-        working-directory: tabatago-swift
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Select Xcode
-        run: sudo xcode-select -switch /Applications/Xcode.app
-
-      - name: Cache SPM dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/Library/Developer/Xcode/DerivedData/**/SourcePackages
-          key: spm-macos-${{ hashFiles('tabatago-swift/project.yml') }}
-          restore-keys: |
-            spm-macos-
-
-      - name: Write App Store Connect API key
-        env:
-          API_KEY_P8: ${{ secrets.APP_STORE_CONNECT_API_KEY_P8 }}
-        run: |
-          printf '%s' "$API_KEY_P8" > "$RUNNER_TEMP/AuthKey.p8"
-
-      - name: Archive
-        run: |
-          xcodebuild archive \
-            -project TabataGo.xcodeproj \
-            -scheme TabataGo \
-            -configuration Release \
-            -archivePath ./build/TabataGo.xcarchive \
-            -allowProvisioningUpdates \
-            -authenticationKeyPath "$RUNNER_TEMP/AuthKey.p8" \
-            -authenticationKeyID "${{ secrets.APP_STORE_CONNECT_KEY_ID }}" \
-            -authenticationKeyIssuerID "${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}" \
-            || { echo "❌ Archive failed — check signing and API key permissions"; exit 1; }
-
-      - name: Verify build settings
-        run: |
-          echo "Checking version and build number..."
-          xcodebuild -showBuildSettings \
-            -project TabataGo.xcodeproj \
-            -scheme TabataGo \
-            -configuration Release \
-            | grep -E "MARKETING_VERSION|CURRENT_PROJECT_VERSION"
-
-      - name: Export IPA
-        run: |
-          xcodebuild -exportArchive \
-            -archivePath ./build/TabataGo.xcarchive \
-            -exportPath ./build/export \
-            -exportOptionsPlist ExportOptions.plist \
-            -allowProvisioningUpdates \
-            -authenticationKeyPath "$RUNNER_TEMP/AuthKey.p8" \
-            -authenticationKeyID "${{ secrets.APP_STORE_CONNECT_KEY_ID }}" \
-            -authenticationKeyIssuerID "${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}" \
-            || { echo "❌ Export failed — check ExportOptions.plist and provisioning"; exit 1; }
-
-      # NOTE: The first upload automatically creates the app record in
-      # App Store Connect if one does not already exist.
-      - name: Upload to App Store
-        run: |
-          xcrun altool --upload-app \
-            --type ios \
-            --file ./build/export/TabataGo.ipa \
-            --apiKey "${{ secrets.APP_STORE_CONNECT_KEY_ID }}" \
-            --apiIssuer "${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}" \
-            || { echo "❌ Upload failed — check API key permissions and app record"; exit 1; }
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,150 +2,42 @@ name: CI

 on:
  push:
-    branches: [main, master]
+    branches: [main]
  pull_request:
-    branches: [main, master]
+    branches: [main]

 jobs:
-  typecheck:
-    name: TypeScript
+  # ── Path filter — determines which downstream jobs run ──
+  changes:
+    name: Detect Changes
    runs-on: ubuntu-latest
+    outputs:
+      admin-web: ${{ steps.filter.outputs.admin-web }}
+      youtube-worker: ${{ steps.filter.outputs.youtube-worker }}
+      supabase-functions: ${{ steps.filter.outputs.supabase-functions }}
    steps:
      - uses: actions/checkout@v4

-      - name: Setup Node.js
-        uses: actions/setup-node@v4
+      - uses: dorny/paths-filter@v3
+        id: filter
        with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Type check
-        run: npx tsc --noEmit
-
-  lint:
-    name: ESLint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run lint
-
-  test:
-    name: Tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run unit tests with coverage
-        run: npm run test:coverage
-
-      - name: Run component render tests
-        run: npm run test:render
-
-      - name: Upload coverage report
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: coverage-report
-          path: coverage/
-          retention-days: 7
-
-      - name: Coverage summary
-        if: always()
-        run: |
-          echo "## Test Coverage Summary" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          if [ -f coverage/coverage-summary.json ]; then
-            echo '```' >> $GITHUB_STEP_SUMMARY
-            node -e "
-              const c = require('./coverage/coverage-summary.json').total;
-              const fmt = (v) => v.pct + '%';
-              console.log('Statements: ' + fmt(c.statements));
-              console.log('Branches:   ' + fmt(c.branches));
-              console.log('Functions:  ' + fmt(c.functions));
-              console.log('Lines:      ' + fmt(c.lines));
-            " >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-          elif [ -f coverage/coverage-final.json ]; then
-            echo "Coverage report generated. Download the artifact for details." >> $GITHUB_STEP_SUMMARY
-          else
-            echo "Coverage report not found." >> $GITHUB_STEP_SUMMARY
-          fi
-
-      - name: Comment coverage on PR
-        if: github.event_name == 'pull_request' && always()
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            let body = '## Test Coverage Report\n\n';
-
-            try {
-              const summary = JSON.parse(fs.readFileSync('coverage/coverage-summary.json', 'utf8'));
-              const total = summary.total;
-              const fmt = (v) => `${v.pct}%`;
-              const icon = (v) => v.pct >= 80 ? '✅' : v.pct >= 60 ? '⚠️' : '❌';
-
-              body += '| Metric | Coverage | Status |\n';
-              body += '|--------|----------|--------|\n';
-              body += `| Statements | ${fmt(total.statements)} | ${icon(total.statements)} |\n`;
-              body += `| Branches | ${fmt(total.branches)} | ${icon(total.branches)} |\n`;
-              body += `| Functions | ${fmt(total.functions)} | ${icon(total.functions)} |\n`;
-              body += `| Lines | ${fmt(total.lines)} | ${icon(total.lines)} |\n`;
-            } catch (e) {
-              body += '_Coverage summary not available._\n';
-            }
-
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            });
-
-            const existing = comments.find(c =>
-              c.user.type === 'Bot' && c.body.includes('## Test Coverage Report')
-            );
-
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                body,
-              });
-            }
+          filters: |
+            admin-web:
+              - 'admin-web/**'
+              - '.github/workflows/ci.yml'
+            youtube-worker:
+              - 'youtube-worker/**'
+              - '.github/workflows/ci.yml'
+            supabase-functions:
+              - 'supabase/functions/**'
+              - 'youtube-worker/**'
+              - '.github/workflows/ci.yml'

+  # ── Admin Web: Next.js ──
  admin-web-test:
-    name: Admin Web Tests
+    name: Admin Web CI
+    needs: changes
+    if: needs.changes.outputs.admin-web == 'true'
    runs-on: ubuntu-latest
    defaults:
      run:
@@ -168,19 +60,22 @@ jobs:

      - name: Run unit tests
        run: npx vitest run
-        continue-on-error: true

      - name: Install Playwright browsers
        run: npx playwright install --with-deps chromium

      - name: Run E2E tests
        run: npx playwright test
-        continue-on-error: true

-  build-check:
-    name: Build Check
+  # ── YouTube Worker: Node.js microservice ──
+  youtube-worker-check:
+    name: YouTube Worker
+    needs: changes
+    if: needs.changes.outputs.youtube-worker == 'true'
    runs-on: ubuntu-latest
-    needs: [typecheck, lint, test]
+    defaults:
+      run:
+        working-directory: youtube-worker
    steps:
      - uses: actions/checkout@v4

@@ -189,39 +84,78 @@ jobs:
        with:
          node-version: '20'
          cache: 'npm'
+          cache-dependency-path: youtube-worker/package-lock.json

      - name: Install dependencies
        run: npm ci

-      - name: Export web build
-        run: npx expo export --platform web
-        continue-on-error: true
+      - name: Validate syntax
+        run: node --check server.js

+  # ── Deploy: Supabase edge functions + YouTube worker ──
  deploy-functions:
-    name: Deploy Edge Functions
+    name: Deploy
+    needs: [changes, admin-web-test, youtube-worker-check]
+    if: |
+      always() &&
+      github.ref == 'refs/heads/main' &&
+      github.event_name == 'push' &&
+      !contains(needs.*.result, 'failure') &&
+      (needs.changes.outputs.supabase-functions == 'true' ||
+       needs.changes.outputs.youtube-worker == 'true')
    runs-on: ubuntu-latest
-    needs: [typecheck, lint, test]
-    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
    steps:
      - uses: actions/checkout@v4

-      - name: Deploy to self-hosted Supabase
+      - name: Setup SSH
        env:
          DEPLOY_HOST: ${{ secrets.SUPABASE_DEPLOY_HOST }}
-          DEPLOY_USER: ${{ secrets.SUPABASE_DEPLOY_USER }}
-          DEPLOY_PATH: ${{ secrets.SUPABASE_DEPLOY_PATH }}
        run: |
          mkdir -p ~/.ssh
          echo "${{ secrets.SUPABASE_SSH_KEY }}" > ~/.ssh/deploy_key
          chmod 600 ~/.ssh/deploy_key
          ssh-keyscan -H $DEPLOY_HOST >> ~/.ssh/known_hosts 2>/dev/null

+      - name: Deploy Supabase Edge Functions
+        env:
+          DEPLOY_HOST: ${{ secrets.SUPABASE_DEPLOY_HOST }}
+          DEPLOY_USER: ${{ secrets.SUPABASE_DEPLOY_USER }}
+          DEPLOY_PATH: ${{ secrets.SUPABASE_DEPLOY_PATH }}
+        run: |
          rsync -avz --delete \
            --exclude='node_modules' \
            --exclude='.DS_Store' \
            -e "ssh -i ~/.ssh/deploy_key" \
            supabase/functions/ \
            "$DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/"
-
          ssh -i ~/.ssh/deploy_key "$DEPLOY_USER@$DEPLOY_HOST" \
            "docker restart supabase-edge-functions"
+
+      - name: Deploy YouTube Worker
+        env:
+          DEPLOY_HOST: ${{ secrets.SUPABASE_DEPLOY_HOST }}
+          DEPLOY_USER: ${{ secrets.SUPABASE_DEPLOY_USER }}
+          WORKER_PATH: /opt/supabase/youtube-worker
+        run: |
+          rsync -avz --delete \
+            --exclude='node_modules' \
+            --exclude='.DS_Store' \
+            -e "ssh -i ~/.ssh/deploy_key" \
+            youtube-worker/ \
+            "$DEPLOY_USER@$DEPLOY_HOST:$WORKER_PATH/"
+          ssh -i ~/.ssh/deploy_key "$DEPLOY_USER@$DEPLOY_HOST" "\
+            cd $WORKER_PATH && \
+            docker build -t youtube-worker:latest . && \
+            docker stop youtube-worker 2>/dev/null || true && \
+            docker rm youtube-worker 2>/dev/null || true && \
+            docker run -d \
+              --name youtube-worker \
+              --restart unless-stopped \
+              --network supabase_supabase-network \
+              -e SUPABASE_URL=\$(docker exec supabase-edge-functions printenv SUPABASE_URL) \
+              -e SUPABASE_SERVICE_ROLE_KEY=\$(docker exec supabase-edge-functions printenv SUPABASE_SERVICE_ROLE_KEY) \
+              -e SUPABASE_PUBLIC_URL=https://supabase.1000co.fr \
+              -e GEMINI_API_KEY=\$(cat /opt/supabase/.env.gemini 2>/dev/null || echo '') \
+              -e STORAGE_BUCKET=workout-audio \
+              -e PORT=3001 \
+              youtube-worker:latest"
--- a/.gitignore
+++ b/.gitignore
@@ -54,4 +54,7 @@ coverage/
 node-compile-cache/
 .gitnexus
 Config/Secrets.xcconfig
+
+_Users_*
+swift-generated-sources/
 tabatago-swift/build/
--- a/skills-lock.json
+++ b/skills-lock.json
@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "skills": {
+    "core-data-expert": {
+      "source": "avdlee/core-data-agent-skill",
+      "sourceType": "github",
+      "skillPath": "core-data-expert/SKILL.md",
+      "computedHash": "b8d2829005b1f2fefbaa8af2ea7d7d64e2fbeca2f2172033176ad0780edc3970"
+    },
+    "swift-architecture-skill": {
+      "source": "efremidze/swift-architecture-skill",
+      "sourceType": "github",
+      "skillPath": "swift-architecture-skill/SKILL.md",
+      "computedHash": "67d3359424b19084631998def14666fd5a77284a45ac0353c41a86a7ed216923"
+    },
+    "swift-concurrency-pro": {
+      "source": "twostraws/swift-concurrency-agent-skill",
+      "sourceType": "github",
+      "skillPath": "swift-concurrency-pro/SKILL.md",
+      "computedHash": "dec65531b4bd37d15e6243dbb0d2d1f554b4f4087bcb2e8deb7273f570fa4069"
+    },
+    "swift-testing-pro": {
+      "source": "twostraws/swift-testing-agent-skill",
+      "sourceType": "github",
+      "skillPath": "swift-testing-pro/SKILL.md",
+      "computedHash": "90504b29146ccd7e88d8ba7244c6c4e4d2b410fb21bdd4ce578f10583b158481"
+    },
+    "swiftdata-pro": {
+      "source": "twostraws/swiftdata-agent-skill",
+      "sourceType": "github",
+      "skillPath": "swiftdata-pro/SKILL.md",
+      "computedHash": "2f979bad98ea3a6744084c5f93e27897f02e8d0ffe15dd03042e88aaae4da14c"
+    },
+    "swiftui-pro": {
+      "source": "twostraws/swiftui-agent-skill",
+      "sourceType": "github",
+      "skillPath": "swiftui-pro/SKILL.md",
+      "computedHash": "07033426e384295a4b49cf0b2ffdefd4098cae4af53fef16bc1f2d9281118c41"
+    },
+    "writing-for-interfaces": {
+      "source": "andrewgleave/skills",
+      "sourceType": "github",
+      "skillPath": "writing-for-interfaces/SKILL.md",
+      "computedHash": "fff061810c3e63b97fea546da1b86d88629f422a5d38d4ac13497b689a18419e"
+    }
+  }
+}
--- a/tabatago-swift/TabataGo.xcodeproj/project.xcworkspace/xcuserdata/20015659.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/tabatago-swift/TabataGo.xcodeproj/project.xcworkspace/xcuserdata/20015659.xcuserdatad/UserInterfaceState.xcuserstate
--- a/tabatago-swift/TabataGo/Resources/Localizable.xcstrings
+++ b/tabatago-swift/TabataGo/Resources/Localizable.xcstrings
@@ -6425,6 +6425,122 @@
          }
        }
      }
+    },
+    "onboarding.allowHealthAccess" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Health-Zugriff erlauben"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Allow Health Access"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Permitir acceso a Salud"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Autoriser l'accès à Santé"
+          }
+        }
+      }
+    },
+    "onboarding.healthAccess" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mit Apple Health verbinden"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Connect to Apple Health"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Conectar con Apple Salud"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Connecter à Apple Santé"
+          }
+        }
+      }
+    },
+    "onboarding.healthAccessSubtitle" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Verfolge Kalorien und Herzfrequenz. Speichere Workouts in der Health App. Deine Daten bleiben privat und auf deinem Gerät."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Track calories and heart rate. Save workouts to your Health app. Your data stays private and on-device."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Registra calorías y frecuencia cardíaca. Guarda entrenamientos en la app Salud. Tus datos permanecen privados y en tu dispositivo."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Suivez les calories et la fréquence cardiaque. Enregistrez vos entraînements dans l'app Santé. Vos données restent privées et sur votre appareil."
+          }
+        }
+      }
+    },
+    "onboarding.notNow" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nicht jetzt"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Not Now"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ahora no"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pas maintenant"
+          }
+        }
+      }
    }
  },
  "version" : "1.0"
--- a/tabatago-swift/TabataGo/Services/HealthKitService.swift
+++ b/tabatago-swift/TabataGo/Services/HealthKitService.swift
@@ -19,7 +19,6 @@ actor HealthKitService {
        [
            HKWorkoutType.workoutType(),
            HKQuantityType(.activeEnergyBurned),
-            HKQuantityType(.heartRate),
        ]
    }

@@ -87,20 +86,6 @@ actor HealthKitService {
            try await builder.addSamples([sample])
        }

-        // Heart rate samples (if captured during workout)
-        if let avgHR = data.averageHeartRate {
-            let hrType = HKQuantityType(.heartRate)
-            let hrUnit = HKUnit.count().unitDivided(by: .minute())
-            let hrQuantity = HKQuantity(unit: hrUnit, doubleValue: avgHR)
-            let hrSample = HKQuantitySample(
-                type: hrType,
-                quantity: hrQuantity,
-                start: data.startedAt,
-                end: data.completedAt
-            )
-            try await builder.addSamples([hrSample])
-        }
-
        try await builder.endCollection(at: data.completedAt)
        guard let workout = try await builder.finishWorkout() else {
            throw HealthKitError.workoutSaveFailed
--- a/tabatago-swift/TabataGo/Utilities/Strings.swift
+++ b/tabatago-swift/TabataGo/Utilities/Strings.swift
@@ -175,7 +175,11 @@ enum L10n {
        static let pill4MinWorkouts       = LocalizedStringResource("onboarding.pill4MinWorkouts")
        static let pillNoEquipment        = LocalizedStringResource("onboarding.pillNoEquipment")
        static let pillVoiceGuided        = LocalizedStringResource("onboarding.pillVoiceGuided")
-        static let tabataDesc             = LocalizedStringResource("onboarding.tabataDesc")
+        static let healthAccess            = LocalizedStringResource("onboarding.healthAccess")
+        static let healthAccessSubtitle    = LocalizedStringResource("onboarding.healthAccessSubtitle")
+        static let allowHealthAccess       = LocalizedStringResource("onboarding.allowHealthAccess")
+        static let notNow                  = LocalizedStringResource("onboarding.notNow")
+        static let tabataDesc              = LocalizedStringResource("onboarding.tabataDesc")

        enum levelDesc {
            static let beginner     = LocalizedStringResource("onboarding.level.beginnerDesc")
--- a/tabatago-swift/TabataGo/ViewModels/PlayerViewModel.swift
+++ b/tabatago-swift/TabataGo/ViewModels/PlayerViewModel.swift
@@ -137,7 +137,11 @@ final class PlayerViewModel: ObservableObject {

        // Start HealthKit live session
        Task {
-            try? await HealthKitService.shared.requestAuthorization()
+            guard await HealthKitService.shared.isAuthorized else {
+                print("[PlayerVM] HealthKit not authorized — skipping live session")
+                return
+            }
+
            liveSession.onHeartRateUpdate = { [weak self] hr in
                Task { @MainActor in self?.heartRate = hr }
            }
--- a/tabatago-swift/TabataGo/Views/Onboarding/OnboardingView.swift
+++ b/tabatago-swift/TabataGo/Views/Onboarding/OnboardingView.swift
@@ -12,7 +12,7 @@ struct OnboardingView: View {
    @Environment(\.modelContext) private var context

    enum Step: Int, CaseIterable {
-        case welcome, name, level, goal, frequency, ready
+        case welcome, name, level, goal, frequency, health, ready
        var progress: Double { Double(rawValue) / Double(Step.allCases.count - 1) }
    }

@@ -67,6 +67,7 @@ struct OnboardingView: View {
                    case .level:     LevelStep(selection: $fitnessLevel)
                    case .goal:      GoalStep(selection: $goal)
                    case .frequency: FrequencyStep(frequency: $weeklyFrequency, barriers: $selectedBarriers, allBarriers: barriers)
+                    case .health:    HealthStep(onContinue: { advance() })
                    case .ready:     ReadyStep(name: name)
                    }
                }
@@ -77,11 +78,13 @@ struct OnboardingView: View {
                .animation(.spring(duration: 0.45), value: step)

                // ── Pinned bottom button ─────────────────────────
-                PrimaryButton(label: buttonLabel, action: buttonAction)
-                    .disabled(step == .name && name.trimmingCharacters(in: .whitespaces).isEmpty)
-                    .padding(.horizontal, 32)
-                    .padding(.bottom, 48)
-                    .padding(.top, 16)
+                if step != .health {
+                    PrimaryButton(label: buttonLabel, action: buttonAction)
+                        .disabled(step == .name && name.trimmingCharacters(in: .whitespaces).isEmpty)
+                        .padding(.horizontal, 32)
+                        .padding(.bottom, 48)
+                        .padding(.top, 16)
+                }
            }
        }
    }
@@ -411,6 +414,68 @@ private struct FrequencyStep: View {
    }
 }

+private struct HealthStep: View {
+    let onContinue: () -> Void
+    @State private var isRequesting = false
+    @State private var appeared = false
+
+    var body: some View {
+        VStack(spacing: 36) {
+            Spacer()
+
+            Image(systemName: "heart.text.square")
+                .font(.system(size: 80))
+                .foregroundStyle(Theme.brand.gradient)
+
+            OnboardingHeader(title: L10n.onboarding.healthAccess, subtitle: L10n.onboarding.healthAccessSubtitle)
+
+            // Primary button — reuses shared PrimaryButton component
+            PrimaryButton(label: L10n.onboarding.allowHealthAccess, action: requestHealthAccess)
+                .disabled(isRequesting)
+                .padding(.horizontal, 32)
+
+            // Skip option
+            Button {
+                onContinue()
+            } label: {
+                Text(L10n.onboarding.notNow)
+                    .font(.subheadline.weight(.medium))
+                    .foregroundStyle(.secondary)
+            }
+            .buttonStyle(.plain)
+            .disabled(isRequesting)
+
+            Spacer()
+        }
+        .opacity(appeared ? 1 : 0)
+        .offset(y: appeared ? 0 : 14)
+        .onAppear {
+            withAnimation(.spring(duration: 0.45)) { appeared = true }
+        }
+    }
+
+    private func requestHealthAccess() {
+        guard !isRequesting else { return }
+        isRequesting = true
+        Task {
+            do {
+                try await HealthKitService.shared.requestAuthorization()
+            } catch {
+                print("[HealthStep] HealthKit authorization error: \(error)")
+                // Continue — user can try later in Settings
+            }
+            let authorized = await HealthKitService.shared.isAuthorized
+            if authorized {
+                AnalyticsService.shared.healthKitPermissionGranted()
+            } else {
+                AnalyticsService.shared.healthKitPermissionDenied()
+            }
+            isRequesting = false
+            onContinue()
+        }
+    }
+}
+
 private struct ReadyStep: View {
    let name: String
    @State private var showContent = false
Author	SHA1	Message	Date
Millian Lamiaux	310124ad63	feat: move HealthKit permission to onboarding, remove HR write All checks were successful CI / Detect Changes (pull_request) Successful in 3s Details CI / Admin Web CI (pull_request) Has been skipped Details CI / YouTube Worker (pull_request) Has been skipped Details CI / Deploy (pull_request) Has been skipped Details - Add .health step to onboarding between frequency and ready - HealthStep with non-blocking permission flow (Not Now skips) - Remove requestAuthorization() from PlayerViewModel.startWorkout() - Guard live session start with isAuthorized check - Remove heart rate write from HealthKit authorization popup - Remove HR sample writing from saveWorkout (now without permission) - Add L10n keys: healthAccess, healthAccessSubtitle, allowHealthAccess, notNow - Add EN/DE/ES/FR translations - Track permission decisions through analytics - Entry animation on HealthStep (fade-in + slide-up) HealthKit permission is now asked once during onboarding, never interrupting workouts again.	2026-05-24 15:18:11 +02:00
Millian Lamiaux	72ad247136	chore: update .gitignore. All checks were successful CI / Detect Changes (push) Successful in 3s Details CI / Admin Web CI (push) Has been skipped Details CI / YouTube Worker (push) Has been skipped Details CI / Deploy (push) Has been skipped Details	2026-05-23 12:29:54 +02:00
millianlmx	f71ba55e8b	Merge pull request 'feat: redesign player with Dynamic Island, compact timer, and fix Live Activity timer drift' (#2 ) from revamp-timer-video-layout into main Some checks failed CI / Detect Changes (push) Successful in 3s Details CI / Admin Web CI (push) Failing after 34s Details CI / YouTube Worker (push) Failing after 5s Details CI / Deploy (push) Failing after 2s Details Reviewed-on: #2	2026-05-23 12:24:34 +02:00
Millian Lamiaux	38576fd528	ci: replace dead Expo CI with linux-only monorepo pipeline Some checks failed CI / Admin Web CI (pull_request) Failing after 34s Details CI / YouTube Worker (pull_request) Failing after 5s Details CI / Deploy (pull_request) Has been skipped Details CI / Detect Changes (pull_request) Successful in 6s Details Remove: root Expo typecheck/lint/test/build-check (project deleted Apr 19) Remove: swift-build-test + app-store.yml (no macOS runner on Gitea) Add: path-filtered conditional jobs with dorny/paths-filter@v3 Add: youtube-worker deploy to deploy-functions job Fix: deploy-functions always() to handle skipped upstream jobs Fix: SPM cache key includes Package.resolved (before removal) Fix: remove continue-on-error from vitest/playwright steps	2026-05-23 12:09:28 +02:00