@daemux/store-automator 0.9.1 → 0.10.1

package/src/install.mjs

@@ -12,7 +12,7 @@ import { promptForTokens } from './prompt.mjs';
 import { getMcpServers, writeMcpJson } from './mcp-setup.mjs';
 import { installClaudeMd, installCiTemplates, installFirebaseTemplates } from './templates.mjs';
 import { writeCiBundleId, writeCiPackageName } from './ci-config.mjs';
-import { installGitHubActionsPath, installCodemagicPath } from './install-paths.mjs';
+import { installGitHubActionsPath } from './install-paths.mjs';
 
 function checkClaudeCli() {
   const result = exec('command -v claude') || exec('which claude');
@@ -94,20 +94,13 @@ function printSummary(scope, oldVersion, newVersion) {
   }
 }
 
-function printNextSteps(isGitHubActions) {
+function printNextSteps() {
   console.log('');
   console.log('Next steps:');
-  if (isGitHubActions) {
-    console.log('  1. Fill ci.config.yaml with credentials');
-    console.log('  2. Add creds/AuthKey.p8 and creds/play-service-account.json');
-    console.log('  3. Set MATCH_PASSWORD secret in GitHub repository settings');
-    console.log('  4. Start Claude Code');
-  } else {
-    console.log('  1. Fill ci.config.yaml (codemagic.app_id is auto-configured if token was provided)');
-    console.log('  2. Add creds/AuthKey.p8 and creds/play-service-account.json');
-    console.log('  3. Start Claude Code');
-    console.log('  Note: For auto-trigger, install gh CLI and run "gh auth login"');
-  }
+  console.log('  1. Fill ci.config.yaml with credentials');
+  console.log('  2. Add creds/AuthKey.p8 and creds/play-service-account.json');
+  console.log('  3. Set MATCH_PASSWORD secret in GitHub repository settings');
+  console.log('  4. Start Claude Code');
 }
 
 export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
@@ -154,11 +147,7 @@ export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
     writeCiPackageName(projectDir, tokens.bundleId);
   }
 
-  if (isGitHubActions) {
-    installGitHubActionsPath(projectDir, packageDir, cliTokens);
-  } else {
-    await installCodemagicPath(projectDir, tokens);
-  }
+  installGitHubActionsPath(projectDir, packageDir, cliTokens);
 
   const scopeLabel = scope === 'user' ? 'global' : 'project';
   console.log(`Configuring ${scopeLabel} settings...`);
@@ -167,5 +156,5 @@ export async function runInstall(scope, isPostinstall = false, cliTokens = {}) {
   injectStatusLine(settingsPath);
 
   printSummary(scope, oldVersion, newVersion);
-  printNextSteps(isGitHubActions);
+  printNextSteps();
 }

package/src/mcp-setup.mjs

@@ -32,17 +32,6 @@ export function getMcpServers(tokens) {
     };
   }
 
-  if (tokens.codemagicToken) {
-    const codemagicEnv = { CODEMAGIC_API_TOKEN: tokens.codemagicToken };
-    if (tokens.codemagicTeamId) codemagicEnv.CODEMAGIC_TEAM_ID = tokens.codemagicTeamId;
-    if (tokens.codemagicAppId) codemagicEnv.CODEMAGIC_APP_ID = tokens.codemagicAppId;
-    servers.codemagic = {
-      command: 'npx',
-      args: ['-y', '@daemux/codemagic-mcp@latest'],
-      env: codemagicEnv,
-    };
-  }
-
   return servers;
 }
 
@@ -78,29 +67,6 @@ export function writeMcpJson(projectDir, servers) {
   }
 }
 
-function updateMcpEnvVar(projectDir, envKey, value) {
-  const mcpPath = join(projectDir, '.mcp.json');
-  if (!existsSync(mcpPath)) return false;
-
-  try {
-    const data = readJson(mcpPath);
-    if (!data.mcpServers?.codemagic?.env) return false;
-    data.mcpServers.codemagic.env[envKey] = value;
-    writeJson(mcpPath, data);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-export function updateMcpAppId(projectDir, appId) {
-  return updateMcpEnvVar(projectDir, 'CODEMAGIC_APP_ID', appId);
-}
-
-export function updateMcpTeamId(projectDir, teamId) {
-  return updateMcpEnvVar(projectDir, 'CODEMAGIC_TEAM_ID', teamId);
-}
-
 export function removeMcpServers(projectDir) {
   const mcpPath = join(projectDir, '.mcp.json');
   if (!existsSync(mcpPath)) return;
@@ -109,7 +75,7 @@ export function removeMcpServers(projectDir) {
     const data = readJson(mcpPath);
     if (!data.mcpServers) return;
 
-    const toRemove = ['playwright', 'mobile-mcp', 'stitch', 'cloudflare', 'codemagic'];
+    const toRemove = ['playwright', 'mobile-mcp', 'stitch', 'cloudflare'];
     for (const name of toRemove) {
       delete data.mcpServers[name];
     }

package/src/prompt.mjs

@@ -16,9 +16,7 @@ function allTokensProvided(cliTokens) {
   return (
     cliTokens.stitchApiKey !== undefined &&
     cliTokens.cloudflareToken !== undefined &&
-    cliTokens.cloudflareAccountId !== undefined &&
-    cliTokens.codemagicToken !== undefined &&
-    cliTokens.codemagicTeamId !== undefined
+    cliTokens.cloudflareAccountId !== undefined
   );
 }
 
@@ -35,8 +33,6 @@ export async function promptForTokens(cliTokens = {}) {
     stitchApiKey: cliTokens.stitchApiKey ?? '',
     cloudflareToken: cliTokens.cloudflareToken ?? '',
     cloudflareAccountId: cliTokens.cloudflareAccountId ?? '',
-    codemagicToken: cliTokens.codemagicToken ?? '',
-    codemagicTeamId: cliTokens.codemagicTeamId ?? '',
   };
 
   if (allPromptsProvided(cliTokens)) {
@@ -98,20 +94,6 @@ export async function promptForTokens(cliTokens = {}) {
       );
     }
 
-    if (cliTokens.codemagicToken === undefined) {
-      result.codemagicToken = await ask(
-        rl,
-        'Codemagic API Token (CM_API_TOKEN for CI/CD builds): '
-      );
-    }
-
-    if (result.codemagicToken && cliTokens.codemagicTeamId === undefined) {
-      result.codemagicTeamId = await ask(
-        rl,
-        'Codemagic Team ID (optional, from Teams page): '
-      );
-    }
-
     return result;
   } finally {
     rl.close();

package/src/templates.mjs

@@ -4,7 +4,6 @@ import { ensureDir } from './utils.mjs';
 
 const FILE_COPIES = [
   ['ci.config.yaml.template', 'ci.config.yaml'],
-  ['codemagic.template.yaml', 'ci-templates/codemagic.template.yaml'],
   ['Gemfile.template', 'Gemfile'],
 ];
 

package/src/uninstall.mjs

@@ -43,7 +43,6 @@ function removeFileIfExists(filePath, label) {
 function removeCiTemplates(projectDir) {
   const files = [
     'ci.config.yaml',
-    'ci-templates/codemagic.template.yaml',
     'Gemfile',
   ];
   for (const file of files) {
@@ -68,9 +67,6 @@ function isDirEmpty(dirPath) {
 }
 
 function removeGitHubWorkflow(projectDir) {
-  const workflowFile = join(projectDir, '.github', 'workflows', 'codemagic-trigger.yml');
-  removeFileIfExists(workflowFile, '.github/workflows/codemagic-trigger.yml');
-
   const workflowsDir = join(projectDir, '.github', 'workflows');
   const githubDir = join(projectDir, '.github');
 

package/src/utils.mjs

@@ -44,12 +44,3 @@ export function readJson(filePath) {
 export function writeJson(filePath, data) {
   writeFileSync(filePath, JSON.stringify(data, null, 2) + '\n', 'utf8');
 }
-
-export function resolveToken(tokenArg) {
-  const token = process.env.CM_API_TOKEN || tokenArg;
-  if (!token) {
-    console.error('Codemagic API token required. Set CM_API_TOKEN or pass --token=...');
-    process.exit(1);
-  }
-  return token;
-}

package/templates/CLAUDE.md.template

@@ -2,7 +2,7 @@
 
 ## Project Overview
 
-This is a Flutter app with Firebase backend, automated for App Store and Google Play publishing via Codemagic CI/CD. This repository MUST be PRIVATE as it contains credential files.
+This is a Flutter app with Firebase backend, automated for App Store and Google Play publishing via GitHub Actions CI/CD. This repository MUST be PRIVATE as it contains credential files.
 
 ## Mandatory Rules
 
@@ -14,7 +14,7 @@ This is a Flutter app with Firebase backend, automated for App Store and Google
 - If unsure which agent to use, use the Task tool with a general-purpose, explore or any other built-in agent
 
 ### DevOps Agent Required
-ALL deployment and infrastructure operations SHOULD use the devops agent (codemagic, firebase, cloudflare, database/deploy, database/optimize).
+ALL deployment and infrastructure operations SHOULD use the devops agent (deploy, firebase, cloudflare, database/deploy, database/optimize).
 Prefer using the devops agent over direct Bash/SSH for structured operations.
 
 ### Code Quality (enforced by agents)
@@ -38,7 +38,7 @@ Prefer using the devops agent over direct Bash/SSH for structured operations.
 ## Configuration Files
 
 ### ci.config.yaml
-Single source of truth: credentials, app identity, store settings, web domain, Codemagic CI/CD (app_id for GitHub Actions auto-trigger, workflow IDs). The Codemagic API token is managed by the codemagic MCP server in `.mcp.json`.
+Single source of truth: credentials, app identity, store settings, web domain.
 
 ### fastlane/metadata/ Structure
 All store listing texts are stored in fastlane directories and managed by the appstore-meta-creator agent:
@@ -95,7 +95,7 @@ Detect from user request:
 - **design** - App design, store screenshots, web page design (Stitch MCP)
 - **metadata** - Store listing texts, IAP config, app rating
 - **database** - Firestore schema, indexes, data migration
-- **infra** - Codemagic CI/CD, Firebase deploy, Cloudflare web deploy
+- **infra** - GitHub Actions CI/CD, Firebase deploy, Cloudflare web deploy
 - **standard** - Mixed or unclear scope
 
 ### Agent Flows
@@ -107,12 +107,12 @@ architect → product-manager(PRE) → developer → simplifier → reviewer →
 
 #### Flutter Flow
 ```
-architect → product-manager(PRE) → [app-designer] → developer(flutter) → simplifier → reviewer → tester(flutter) → tester(mobile-ui) → product-manager(POST) → [devops(codemagic)]
+architect → product-manager(PRE) → [app-designer] → developer(flutter) → simplifier → reviewer → tester(flutter) → tester(mobile-ui) → product-manager(POST) → [devops(deploy)]
 ```
 
 #### Backend Flow
 ```
-architect → product-manager(PRE) → developer(backend) → simplifier → reviewer → tester(backend) → product-manager(POST) → [devops(firebase)]
+architect → product-manager(PRE) → developer(backend) → simplifier → reviewer → tester(backend) → product-manager(POST) → [devops(deploy)]
 ```
 
 #### Design Flow
@@ -127,7 +127,7 @@ appstore-meta-creator → appstore-reviewer
 
 #### Database Flow
 ```
-architect → developer(backend) → simplifier → reviewer → product-manager(POST) → [devops(firebase)]
+architect → developer(backend) → simplifier → reviewer → product-manager(POST) → [devops(deploy)]
 ```
 
 #### Infra Flow
@@ -137,7 +137,7 @@ devops (standalone)
 
 #### Full Publishing Flow (Design to App Store)
 ```
-architect → product-manager(PRE) → app-designer → developer(flutter) → simplifier → reviewer → tester(flutter) → tester(mobile-ui) → appstore-meta-creator → appstore-reviewer → product-manager(POST) → devops(codemagic)
+architect → product-manager(PRE) → app-designer → developer(flutter) → simplifier → reviewer → tester(flutter) → tester(mobile-ui) → appstore-meta-creator → appstore-reviewer → product-manager(POST) → devops(deploy)
 ```
 
 #### Team Size Annotations
@@ -160,17 +160,17 @@ architect{T:2} → product-manager(PRE) → developer{T:2-4} → simplifier →
 
 ##### Flutter Flow (with teams)
 ```
-architect{T:2} → product-manager(PRE) → [app-designer{T:2-3}] → developer(flutter){T:2-4} → simplifier → reviewer{T:2-3} → tester(flutter){T:2} → tester(mobile-ui){T:2} → product-manager(POST) → [devops(codemagic)]
+architect{T:2} → product-manager(PRE) → [app-designer{T:2-3}] → developer(flutter){T:2-4} → simplifier → reviewer{T:2-3} → tester(flutter){T:2} → tester(mobile-ui){T:2} → product-manager(POST) → [devops(deploy)]
 ```
 
 ##### Backend Flow (with teams)
 ```
-architect{T:2} → product-manager(PRE) → developer(backend){T:2-4} → simplifier → reviewer{T:2} → tester(backend){T:2} → product-manager(POST) → [devops(firebase)]
+architect{T:2} → product-manager(PRE) → developer(backend){T:2-4} → simplifier → reviewer{T:2} → tester(backend){T:2} → product-manager(POST) → [devops(deploy)]
 ```
 
 ##### Full Publishing Flow (with teams)
 ```
-architect{T:2} → product-manager(PRE) → app-designer{T:2-3} → developer(flutter){T:2-4} → simplifier → reviewer{T:2-3} → tester(flutter){T:2} → tester(mobile-ui){T:2} → appstore-meta-creator{T:2-5} → appstore-reviewer → product-manager(POST) → devops(codemagic)
+architect{T:2} → product-manager(PRE) → app-designer{T:2-3} → developer(flutter){T:2-4} → simplifier → reviewer{T:2-3} → tester(flutter){T:2} → tester(mobile-ui){T:2} → appstore-meta-creator{T:2-5} → appstore-reviewer → product-manager(POST) → devops(deploy)
 ```
 
 ### Agents Reference
@@ -183,7 +183,7 @@ architect{T:2} → product-manager(PRE) → app-designer{T:2-3} → developer(fl
 | simplifier | AFTER developer - simplifies Dart/Flutter code |
 | reviewer | After ANY code changes - Dart/Flutter quality review |
 | tester | After review passes (type: flutter/mobile-ui/web/backend/integration) |
-| devops | Operations (mode: codemagic/firebase/cloudflare/database+deploy/database+optimize) |
+| devops | Operations (mode: deploy/firebase/cloudflare/database+deploy/database+optimize) |
 | app-designer | Stitch MCP design: app screens + store screenshots + web page design |
 | appstore-meta-creator | Generate store listing texts for all configured languages |
 | appstore-reviewer | Full App Store/Play compliance review including live app UI testing via mobile-mcp |
@@ -228,7 +228,7 @@ If the same error persists unchanged after one full fix cycle, try a fundamental
 - `APPROVED` or `COMPLETE` from product-manager
 - Deployment is optional when not configured
 
-**Before devops(codemagic):**
+**Before devops(deploy):**
 - appstore-reviewer APPROVED (if publishing)
 - All metadata files present for configured languages
 - All screenshots present and verified (dimensions match requirements)
@@ -260,13 +260,13 @@ appstore-meta-creator generates texts. Fill fastlane/iap_config.json if needed.
 app-designer designs marketing page in Stitch MCP. Develop web pages. Deploy via Cloudflare Pages (*.pages.dev domain sufficient).
 
 ### Phase 5: Finalize and CI/CD
-Create .gitignore (.claude/.tasks/, Flutter ignores; do NOT ignore *.g.dart). Run scripts/generate.sh. Fill codemagic.app_id. Push to private repo. GitHub Actions auto-triggers on push.
+Create .gitignore (.claude/.tasks/, Flutter ignores; do NOT ignore *.g.dart). Push to private repo. GitHub Actions auto-triggers on push.
 
 ### Phase 6: First Publish
 iOS: fully automated. Android: first build creates AAB + manual steps guide; subsequent builds fully automated.
 
 ### Phase 7: Ongoing Updates
-Push to main. Codemagic detects changes and uploads modified assets. Version auto-incremented.
+Push to main. GitHub Actions detects changes and uploads modified assets. Version auto-incremented.
 
 ---
 ## FOR ORCHESTRATORS ONLY
@@ -392,11 +392,11 @@ LAUNCHING: [first-agent-name]
 
 **Expected RECOMMENDED FLOW outputs (copy exactly):**
 
-- **flutter**: `architect → product-manager(PRE) → [app-designer] → developer(flutter) → simplifier → reviewer → tester(flutter) → tester(mobile-ui) → product-manager(POST) → [devops(codemagic)]`
-- **backend**: `architect → product-manager(PRE) → developer(backend) → simplifier → reviewer → tester(backend) → product-manager(POST) → [devops(firebase)]`
+- **flutter**: `architect → product-manager(PRE) → [app-designer] → developer(flutter) → simplifier → reviewer → tester(flutter) → tester(mobile-ui) → product-manager(POST) → [devops(deploy)]`
+- **backend**: `architect → product-manager(PRE) → developer(backend) → simplifier → reviewer → tester(backend) → product-manager(POST) → [devops(deploy)]`
 - **design**: `app-designer → appstore-reviewer`
 - **metadata**: `appstore-meta-creator → appstore-reviewer`
-- **database**: `architect → developer(backend) → simplifier → reviewer → product-manager(POST) → [devops(firebase)]`
+- **database**: `architect → developer(backend) → simplifier → reviewer → product-manager(POST) → [devops(deploy)]`
 - **infra**: `devops (standalone)`
 - **standard**: `architect → product-manager(PRE) → developer → simplifier → reviewer → tester → product-manager(POST) → [devops]`
 

package/templates/ci.config.yaml.template

@@ -56,14 +56,3 @@ web:
   jurisdiction: "State of California, United States"
   app_store_url: ""
   google_play_url: ""
-
-# === CODEMAGIC CI/CD ===
-# Fill after creating app in Codemagic (https://codemagic.io/apps)
-# Find app_id in your Codemagic dashboard URL: codemagic.io/app/{app_id}
-# API token is stored in .mcp.json (codemagic MCP server, set during install)
-codemagic:
-  team_id: ""                   # Team ID from Codemagic Teams page
-  app_id: ""
-  workflows:
-    - ios-release
-    - android-release

package/templates/fastlane/android/Fastfile.template

@@ -1,8 +1,8 @@
 default_platform(:android)
 
 # Resolve paths absolutely to avoid symlink-relative breakage.
-# CM_BUILD_DIR is set by Codemagic CI; locally we derive from __FILE__.
-ROOT_DIR = ENV.fetch("CM_BUILD_DIR", File.expand_path("../..", __FILE__))
+# PROJECT_ROOT is set by CI scripts (read-config.sh); locally we derive from __FILE__.
+ROOT_DIR = ENV.fetch("PROJECT_ROOT", File.expand_path("../..", __FILE__))
 APP_DIR  = ENV.fetch("APP_ROOT", "#{ROOT_DIR}/app")
 APP_DIR  = "#{ROOT_DIR}/#{APP_DIR}" unless APP_DIR.start_with?("/")
 

package/templates/fastlane/android/Pluginfile.template

@@ -1,4 +1,4 @@
 # fastlane-plugin-iap is not yet published.
-# IAP sync is handled gracefully in codemagic.yaml (non-blocking).
+# IAP sync is handled gracefully in CI workflows (non-blocking).
 # Uncomment when the plugin is available:
 # gem "fastlane-plugin-iap", git: "https://github.com/daemux/fastlane-plugin-iap"

package/templates/fastlane/ios/Fastfile.template

@@ -1,8 +1,8 @@
 default_platform(:ios)
 
 # Resolve paths absolutely to avoid symlink-relative breakage.
-# CM_BUILD_DIR is set by Codemagic CI; locally we derive from __FILE__.
-ROOT_DIR = ENV.fetch("CM_BUILD_DIR", File.expand_path("../..", __FILE__))
+# PROJECT_ROOT is set by CI scripts (read-config.sh); locally we derive from __FILE__.
+ROOT_DIR = ENV.fetch("PROJECT_ROOT", File.expand_path("../..", __FILE__))
 APP_DIR  = ENV.fetch("APP_ROOT", "#{ROOT_DIR}/app")
 APP_DIR  = "#{ROOT_DIR}/#{APP_DIR}" unless APP_DIR.start_with?("/")
 
@@ -80,7 +80,8 @@ platform :ios do
         skip_metadata: !metadata_changed?("fastlane/metadata/ios/"),
         skip_screenshots: !metadata_changed?("fastlane/screenshots/ios/"),
         run_precheck_before_submit: true,
-        precheck_include_in_app_purchases: false
+        precheck_include_in_app_purchases: false,
+        wait_processing_timeout_duration: 1800
       )
     )
   end
@@ -99,12 +100,13 @@ platform :ios do
 
   lane :upload_binary_ios do
     deliver(
-      base_deliver_options.merge(submission_options).merge(
+      base_deliver_options.merge(
         ipa: Dir.glob("#{APP_DIR}/build/ios/ipa/*.ipa").first,
         skip_metadata: true,
         skip_screenshots: true,
-        run_precheck_before_submit: true,
-        precheck_include_in_app_purchases: false
+        run_precheck_before_submit: false,
+        submit_for_review: false,
+        wait_processing_timeout_duration: 1800
       )
     )
   end

package/templates/fastlane/ios/Pluginfile.template

@@ -1,4 +1,4 @@
 # fastlane-plugin-iap is not yet published.
-# IAP sync is handled gracefully in codemagic.yaml (non-blocking).
+# IAP sync is handled gracefully in CI workflows (non-blocking).
 # Uncomment when the plugin is available:
 # gem "fastlane-plugin-iap", git: "https://github.com/daemux/fastlane-plugin-iap"

package/templates/fastlane/ios/Snapfile.template

@@ -1,4 +1,4 @@
-root_dir = ENV.fetch("CM_BUILD_DIR", File.expand_path("../..", __FILE__))
+root_dir = ENV.fetch("PROJECT_ROOT", File.expand_path("../..", __FILE__))
 
 devices([
   "iPhone 16 Pro Max",

package/templates/github/workflows/android-release.yml

@@ -1,8 +1,4 @@
 name: Android Release
-# POST-MIGRATION CLEANUP (after GitHub Actions workflows are verified in production):
-#   - Remove .github/workflows/codemagic-trigger.yml
-#   - Remove any Codemagic-specific configuration files
-#   - Update README/docs to reference GitHub Actions instead of Codemagic
 on:
   push:
     branches: [main]
@@ -39,6 +35,9 @@ jobs:
       - name: Install yq
         run: brew install yq
 
+      - name: Init Summary
+        run: echo "| Step | Status | Details |" >> $GITHUB_STEP_SUMMARY && echo "|------|--------|---------|" >> $GITHUB_STEP_SUMMARY
+
       - name: Link Fastlane
         run: scripts/ci/common/link-fastlane.sh android
 
@@ -49,15 +48,18 @@ jobs:
         run: scripts/ci/android/check-readiness.sh
 
       - name: Upload Metadata & Screenshots
+        id: upload-metadata
         run: scripts/ci/android/upload-metadata.sh
 
       - name: Sync IAP
+        id: sync-iap
         run: scripts/ci/android/sync-iap.sh
 
       - name: Install Python dependencies
         run: pip3 install --break-system-packages google-api-python-client google-auth
 
       - name: Update Data Safety
+        id: update-data-safety
         run: scripts/ci/android/update-data-safety.sh
 
       - name: Save .ci-state

package/templates/github/workflows/ios-release.yml

@@ -1,8 +1,4 @@
 name: iOS Release
-# POST-MIGRATION CLEANUP (after GitHub Actions workflows are verified in production):
-#   - Remove .github/workflows/codemagic-trigger.yml
-#   - Remove any Codemagic-specific configuration files
-#   - Update README/docs to reference GitHub Actions instead of Codemagic
 on:
   push:
     branches: [main]
@@ -39,6 +35,9 @@ jobs:
       - name: Install yq
         run: brew install yq
 
+      - name: Init Summary
+        run: echo "| Step | Status | Details |" >> $GITHUB_STEP_SUMMARY && echo "|------|--------|---------|" >> $GITHUB_STEP_SUMMARY
+
       - name: Link Fastlane
         run: scripts/ci/common/link-fastlane.sh ios
 
@@ -46,9 +45,11 @@ jobs:
         run: scripts/ci/common/install-fastlane.sh ios
 
       - name: Upload Metadata & Screenshots
+        id: upload-metadata
         run: scripts/ci/ios/upload-metadata.sh
 
       - name: Sync IAP
+        id: sync-iap
         run: scripts/ci/ios/sync-iap.sh
 
       - name: Save .ci-state
@@ -71,6 +72,16 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Select Xcode 26
+        run: |
+          XCODE_PATH=$(ls -d /Applications/Xcode_26*.app 2>/dev/null | sort -V | tail -1)
+          if [ -z "$XCODE_PATH" ]; then
+            echo "ERROR: No Xcode 26.x found on this runner" >&2
+            exit 1
+          fi
+          sudo xcode-select -s "$XCODE_PATH"
+          xcodebuild -version
+
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:

package/templates/scripts/check_changed.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Usage: ./scripts/check_changed.sh <path>
 # Exit 0 if changed, exit 1 if unchanged
-# Used by codemagic.yaml for conditional metadata/screenshot uploads
+# Used by CI workflows for conditional metadata/screenshot uploads
 
 set -euo pipefail
 

package/templates/scripts/ci/android/sync-iap.sh

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
+# Requires link-fastlane.sh and install-fastlane.sh to have run first (workflow steps).
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../common/read-config.sh"
+source "$SCRIPT_DIR/../common/ci-notify.sh"
 
 # --- Check Google Play readiness ---
 if [ "${GOOGLE_PLAY_READY:-false}" != "true" ]; then
@@ -13,16 +15,13 @@ fi
 # --- Check if IAP config exists ---
 IAP_CONFIG="$PROJECT_ROOT/fastlane/iap_config.json"
 if [ ! -f "$IAP_CONFIG" ]; then
-  echo "No iap_config.json found at $IAP_CONFIG. Skipping IAP sync."
-  exit 0
+  ci_skip "No Android IAP config file found"
 fi
 
 # --- Check if IAP plugin is available ---
 cd "$APP_ROOT/android"
-if ! bundle exec gem list fastlane-plugin-iap --installed > /dev/null 2>&1; then
-  echo "WARNING: fastlane-plugin-iap not installed. Skipping IAP sync."
-  echo "To enable: add it to app/android/Pluginfile and run 'bundle install'."
-  exit 0
+if ! bundle exec gem list fastlane-plugin-iap --installed >/dev/null 2>&1; then
+  ci_skip "fastlane-plugin-iap not installed"
 fi
 
 # --- Hash-based change detection ---
@@ -35,8 +34,7 @@ STATE_FILE="$STATE_DIR/android-iap-hash"
 if [ -f "$STATE_FILE" ]; then
   STORED_HASH=$(cat "$STATE_FILE")
   if [ "$HASH" = "$STORED_HASH" ]; then
-    echo "No changes in iap_config.json (hash: ${HASH:0:12}...). Skipping."
-    exit 0
+    ci_skip "Android IAP config unchanged since last sync"
   fi
 fi
 
@@ -56,8 +54,7 @@ PACKAGE_NAME="$PACKAGE_NAME" \
 GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_PATH="$SA_FULL_PATH" \
 bundle exec fastlane sync_google_iap
 
-echo "Android IAP sync complete"
-
 # --- Update hash on success ---
 echo "$HASH" > "$STATE_FILE"
-echo "Updated state hash: ${HASH:0:12}..."
+
+ci_done "Android IAP synced to Google Play"

package/templates/scripts/ci/android/update-data-safety.sh

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
+# Requires link-fastlane.sh and install-fastlane.sh to have run first (workflow steps).
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../common/read-config.sh"
+source "$SCRIPT_DIR/../common/ci-notify.sh"
 
 # --- Check Google Play readiness ---
 if [ "${GOOGLE_PLAY_READY:-false}" != "true" ]; then
@@ -13,8 +15,7 @@ fi
 # --- Check if data safety CSV exists ---
 DATA_SAFETY_CSV="$PROJECT_ROOT/fastlane/data_safety.csv"
 if [ ! -f "$DATA_SAFETY_CSV" ]; then
-  echo "No data_safety.csv found at $DATA_SAFETY_CSV. Skipping."
-  exit 0
+  ci_skip "No data safety CSV found"
 fi
 
 # --- Hash-based change detection ---
@@ -27,22 +28,12 @@ STATE_FILE="$STATE_DIR/android-data-safety-hash"
 if [ -f "$STATE_FILE" ]; then
   STORED_HASH=$(cat "$STATE_FILE")
   if [ "$HASH" = "$STORED_HASH" ]; then
-    echo "No changes in data_safety.csv (hash: ${HASH:0:12}...). Skipping."
-    exit 0
+    ci_skip "Data safety CSV unchanged since last upload"
   fi
 fi
 
 echo "Changes detected in data safety config (hash: ${HASH:0:12}...)"
 
-# --- Link fastlane directories ---
-"$SCRIPT_DIR/../common/link-fastlane.sh" android
-
-# --- Ensure fastlane is installed ---
-cd "$APP_ROOT/android"
-if ! bundle exec fastlane --version >/dev/null 2>&1; then
-  "$SCRIPT_DIR/../common/install-fastlane.sh" android
-fi
-
 # --- Resolve service account path ---
 SA_FULL_PATH="$PROJECT_ROOT/$GOOGLE_SA_JSON_PATH"
 if [ ! -f "$SA_FULL_PATH" ]; then
@@ -50,16 +41,24 @@ if [ ! -f "$SA_FULL_PATH" ]; then
   exit 1
 fi
 
-# --- Update data safety via Fastlane ---
+# --- Update data safety via Python script ---
+# Exit codes: 0 = success, 2 = API limitation (manual update needed), other = error
 echo "Updating Android data safety..."
 
+set +e
 PACKAGE_NAME="$PACKAGE_NAME" \
 GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_PATH="$SA_FULL_PATH" \
-DATA_SAFETY_CSV_PATH="$DATA_SAFETY_CSV" \
-bundle exec fastlane update_data_safety
+python3 "$PROJECT_ROOT/scripts/update_data_safety.py" "$DATA_SAFETY_CSV"
+SAFETY_EXIT=$?
+set -e
 
-echo "Android data safety update complete"
-
-# --- Update hash on success ---
-echo "$HASH" > "$STATE_FILE"
-echo "Updated state hash: ${HASH:0:12}..."
+if [ $SAFETY_EXIT -eq 0 ]; then
+  echo "$HASH" > "$STATE_FILE"
+  ci_done "Data safety section updated"
+elif [ $SAFETY_EXIT -eq 2 ]; then
+  # API limitation is non-fatal; hash is NOT saved so the step retries next run
+  ci_skip "API limitation — update manually via Google Play Console (will retry next run)"
+else
+  echo "ERROR: Data safety update failed (exit code: $SAFETY_EXIT)" >&2
+  exit $SAFETY_EXIT
+fi