project-auto-wizard 0.15.0 → 0.16.0

package/payload/workflows/common/PROJECT-COMMON-RELEASE-PUBLISH.yaml

@@ -35,6 +35,13 @@
 # trigger and workflow_dispatch is dispatched too. A PAT or human merge
 # already fired the push event, so those are left alone (no double deploy).
 #
+# The trunk-based docs commit is pushed with fetch -> rebase -> push retries.
+# If README.md conflicts with a concurrent README commit (a date refresh),
+# the remote README is kept and the released version line is reapplied, so
+# a README conflict never stops the tag and the Release from being created.
+# README-VERSION-UPDATE skips its own push run in trunk-based mode; this
+# workflow dispatches it after publishing instead.
+#
 # Release-confirm pattern: "chore(release):" — keep in sync with
 # PROJECT-COMMON-AUTO-CHANGELOG-CONTROL and PROJECT-COMMON-VERSION-CONTROL.
 #
@@ -94,6 +101,7 @@ jobs:
       - name: Detect branch mode
         id: mode
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           # scoped to the metadata: -> template: -> branches: chain so an
           # unrelated top-level "mode:" key can never hijack the value
@@ -104,6 +112,7 @@ jobs:
       - name: Release gate
         id: gate
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           MODE="${{ steps.mode.outputs.mode }}"
           EVENT="${{ github.event_name }}"
@@ -167,6 +176,7 @@ jobs:
           steps.mode.outputs.mode == 'trunk-based' &&
           github.event_name == 'push'
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           # scoped to the metadata: -> template: -> options: chain so an
           # unrelated "semver_auto:" key can never hijack the value
@@ -181,6 +191,7 @@ jobs:
           steps.mode.outputs.mode == 'trunk-based' &&
           github.event_name == 'push'
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           # scoped to the metadata: -> template: -> options: chain so an
           # unrelated "copilot_ai:" key can never hijack the value
@@ -209,6 +220,7 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
           COPILOT_AI: ${{ steps.copilot_options.outputs.copilot_ai }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           # Idempotency: on a re-run of a failed job the checked-out HEAD may
           # already be this workflow's own docs commit — never bump twice.
@@ -297,8 +309,12 @@ jobs:
           else
             git commit -m "chore(version): release v${NEW_VERSION} docs [skip ci]"
 
-            # Race-condition guard: pull-rebase then push (up to 3 retries)
-            MAX_RETRIES=3
+            # >>> push-with-retry
+            # Race-condition guard: fetch -> rebase -> push, retried. A concurrent
+            # README-only commit (date refresh) touches the same version line and
+            # conflicts on rebase; the remote README is kept and this run's version
+            # line is reapplied, so a README conflict never blocks the release.
+            MAX_RETRIES=5
             RETRY_COUNT=0
             PUSH_SUCCESS=false
 
@@ -310,22 +326,36 @@ jobs:
                 PUSH_SUCCESS=true
                 echo "$(m wf_release.docs_pushed)"
                 break
-              else
-                echo "$(m wf_common.push_failed_syncing)"
-                if git pull --rebase origin {{MAIN_BRANCH}}; then
-                  echo "$(m wf_common.rebase_ok)"
-                else
-                  echo "$(m wf_common.rebase_failed)"
-                  git rebase --abort 2>/dev/null || true
-                  exit 1
+              fi
+
+              echo "$(m wf_common.push_failed_syncing)"
+              git fetch origin {{MAIN_BRANCH}}
+              if git rebase origin/{{MAIN_BRANCH}}; then
+                echo "$(m wf_common.rebase_ok)"
+                continue
+              fi
+
+              # Only README.md conflicting: "ours" is the remote side during a rebase
+              if [ "$(git diff --name-only --diff-filter=U)" = "README.md" ]; then
+                git checkout --ours -- README.md
+                python3 -c 'import sys; sys.path.insert(0, ".github/scripts"); import version_manager as vm; vm.update_readme_version(vm.get_current_version())' || true
+                git add README.md
+                if GIT_EDITOR=true git rebase --continue; then
+                  echo "$(m wf_common.readme_conflict_resolved)"
+                  continue
                 fi
               fi
+
+              echo "$(m wf_common.rebase_failed)"
+              git rebase --abort 2>/dev/null || true
+              exit 1
             done
 
             if [ "$PUSH_SUCCESS" = false ]; then
               echo "$(m wf_common.push_gave_up max_retries="$MAX_RETRIES")"
               exit 1
             fi
+            # <<< push-with-retry
           fi
 
       - name: Resolve version + idempotency guard
@@ -334,6 +364,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           VERSION=$(python3 .github/scripts/version_manager.py get | tail -n 1)
           if [ -z "$VERSION" ]; then
@@ -365,6 +396,7 @@ jobs:
       - name: Create and push tag
         if: steps.gate.outputs.proceed == 'true' && steps.version.outputs.tag_exists != 'true'
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           VERSION="${{ steps.version.outputs.version }}"
           git tag "v$VERSION"
@@ -376,6 +408,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           VERSION="${{ steps.version.outputs.version }}"
 
@@ -415,6 +448,7 @@ jobs:
           # default token.
           GH_TOKEN: ${{ secrets.WORKFLOW_PAT || github.token }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           VERSION="${{ steps.version.outputs.version }}"
           gh release create "v$VERSION" --title "v$VERSION" --notes-file notes.md
@@ -430,6 +464,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           if gh workflow run PROJECT-COMMON-README-VERSION-UPDATE.yaml --ref {{MAIN_BRANCH}}; then
             echo "$(m wf_release.readme_dispatch_ok)"
@@ -457,6 +492,7 @@ jobs:
           RELEASE_VERSION: ${{ steps.version.outputs.version }}
           MAIN_BRANCH: "{{MAIN_BRANCH}}"
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           # Merge commit of this version's release PR - releases that are not merges
           # (safety-net bump, manual republish) were already deployed by a human push,

package/payload/workflows/common/PROJECT-COMMON-VERSION-CONTROL.yaml

@@ -66,6 +66,7 @@ jobs:
       - name: Release merge / mode guard
         id: release_guard
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           SKIP="false"
 
@@ -104,6 +105,7 @@ jobs:
         id: current_version
         if: steps.release_guard.outputs.skip != 'true'
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           CURRENT_VERSION=$(python3 .github/scripts/version_manager.py get | tail -n 1)
           if [ -z "$CURRENT_VERSION" ]; then
@@ -117,6 +119,7 @@ jobs:
         id: version
         if: steps.release_guard.outputs.skip != 'true'
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           NEW_VERSION=$(python3 .github/scripts/version_manager.py increment | tail -n 1)
           if [ -z "$NEW_VERSION" ]; then
@@ -131,6 +134,7 @@ jobs:
         id: project_info
         if: steps.release_guard.outputs.skip != 'true'
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           if [ -f "version.yml" ]; then
             PROJECT_TYPES=$(grep "^project_types:" version.yml 2>/dev/null | sed -E 's/.*\[([^]]*)\].*/\1/' | tr -d '" ')
@@ -154,6 +158,7 @@ jobs:
           AI_API_BASE_URL: ${{ vars.AI_API_BASE_URL }}
           AI_MODEL: ${{ vars.AI_MODEL }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           NEW_VERSION="${{ steps.version.outputs.new_version }}"
 
@@ -188,6 +193,7 @@ jobs:
         id: commit_push
         if: steps.release_guard.outputs.skip != 'true'
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
@@ -206,8 +212,12 @@ jobs:
             COMMIT_MSG="chore(version): bump to v${NEW_VERSION} [skip ci]"
 
             if git commit -m "$COMMIT_MSG"; then
-              # Race-condition guard: pull-rebase then push (up to 3 retries)
-              MAX_RETRIES=3
+              # >>> push-with-retry
+              # Race-condition guard: fetch -> rebase -> push, retried. A concurrent
+              # README-only commit (date refresh) touches the same version line and
+              # conflicts on rebase; the remote README is kept and this run's version
+              # line is reapplied, so a README conflict never blocks the release.
+              MAX_RETRIES=5
               RETRY_COUNT=0
               PUSH_SUCCESS=false
 
@@ -219,22 +229,36 @@ jobs:
                   PUSH_SUCCESS=true
                   echo "$(m wf_version.bump_pushed)"
                   break
-                else
-                  echo "$(m wf_common.push_failed_syncing)"
-                  if git pull --rebase origin {{MAIN_BRANCH}}; then
-                    echo "$(m wf_common.rebase_ok)"
-                  else
-                    echo "$(m wf_common.rebase_failed)"
-                    git rebase --abort 2>/dev/null || true
-                    exit 1
+                fi
+
+                echo "$(m wf_common.push_failed_syncing)"
+                git fetch origin {{MAIN_BRANCH}}
+                if git rebase origin/{{MAIN_BRANCH}}; then
+                  echo "$(m wf_common.rebase_ok)"
+                  continue
+                fi
+
+                # Only README.md conflicting: "ours" is the remote side during a rebase
+                if [ "$(git diff --name-only --diff-filter=U)" = "README.md" ]; then
+                  git checkout --ours -- README.md
+                  python3 -c 'import sys; sys.path.insert(0, ".github/scripts"); import version_manager as vm; vm.update_readme_version(vm.get_current_version())' || true
+                  git add README.md
+                  if GIT_EDITOR=true git rebase --continue; then
+                    echo "$(m wf_common.readme_conflict_resolved)"
+                    continue
                   fi
                 fi
+
+                echo "$(m wf_common.rebase_failed)"
+                git rebase --abort 2>/dev/null || true
+                exit 1
               done
 
               if [ "$PUSH_SUCCESS" = false ]; then
                 echo "$(m wf_common.push_gave_up max_retries="$MAX_RETRIES")"
                 exit 1
               fi
+              # <<< push-with-retry
               echo "pushed=true" >> "$GITHUB_OUTPUT"
             else
               echo "$(m wf_version.commit_failed)"
@@ -248,6 +272,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           gh workflow run PROJECT-COMMON-RELEASE-PUBLISH.yaml --ref {{MAIN_BRANCH}}
           echo "$(m wf_version.release_publish_triggered)"
@@ -260,6 +285,7 @@ jobs:
         # so only a warning is left.
         if: steps.release_guard.outputs.skip != 'true' && steps.commit_push.outputs.pushed == 'true'
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           DEVELOP_BRANCH="{{DEVELOP_BRANCH}}"
           NEW_VERSION="${{ steps.version.outputs.new_version }}"
@@ -293,10 +319,13 @@ jobs:
 
       - name: Summary
         if: always()
+        env:
+          PAW_REF_NAME: ${{ github.ref_name }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           echo "$(m wf_version.finished)"
           echo "$(m wf_version.sum_skipped skip="${{ steps.release_guard.outputs.skip }}")"
           echo "$(m wf_version.sum_previous current_version="${{ steps.current_version.outputs.current_version }}")"
           echo "$(m wf_version.sum_new new_version="${{ steps.version.outputs.new_version }}")"
-          echo "$(m wf_version.sum_branch ref_name="${{ github.ref_name }}")"
+          echo "$(m wf_version.sum_branch ref_name="$PAW_REF_NAME")"

package/payload/workflows/flutter/PROJECT-FLUTTER-ANDROID-FIREBASE-CICD.yaml

@@ -96,6 +96,7 @@ jobs:
           RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
           FIREBASE_SERVICE_ACCOUNT_JSON_BASE64: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON_BASE64 }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           MISSING=""
           for NAME in RELEASE_KEYSTORE_BASE64 RELEASE_KEYSTORE_PASSWORD RELEASE_KEY_ALIAS RELEASE_KEY_PASSWORD FIREBASE_SERVICE_ACCOUNT_JSON_BASE64; do
@@ -123,14 +124,16 @@ jobs:
         env:
           ENV_CONTENT: ${{ secrets.ENV_FILE || secrets.ENV }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
+          m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           if [ "$ENV_MODE" = "dotenv" ]; then
             printf '%s\n' "$ENV_CONTENT" > .env
-            echo ".env file created"
+            m wf_flutter.dotenv_created
           elif [ -n "$ENV_CONTENT" ]; then
             DART_DEFINE_FILE="$RUNNER_TEMP/dart-define.env"
             printf '%s\n' "$ENV_CONTENT" > "$DART_DEFINE_FILE"
             echo "DART_DEFINE_FILE=$DART_DEFINE_FILE" >> "$GITHUB_ENV"
-            echo "dart-define file prepared"
+            m wf_flutter.dart_define_prepared
           fi
 
       - name: Set up Flutter
@@ -158,6 +161,7 @@ jobs:
         id: current_version
         working-directory: ${{ github.workspace }}   # version_manager.py must read the repo-root version.yml
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           # Get VERSION (x.y.z format)
           VERSION=$(python3 .github/scripts/version_manager.py get | tail -n 1)
@@ -179,13 +183,14 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "VERSION_CODE=$VERSION_CODE" >> $GITHUB_ENV
           echo "TODAY=$(date '+%Y-%m-%d')" >> $GITHUB_ENV
-          echo "TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S')" >> $GITHUB_ENV
+          echo "TIMESTAMP=$(date -u '+%Y-%m-%d %H:%M:%S UTC')" >> $GITHUB_ENV
           echo "PROJECT_TYPE=${{ env.PROJECT_TYPE }}" >> $GITHUB_ENV
 
       - name: Generate release notes
         id: release_notes
         working-directory: ${{ github.workspace }}   # CHANGELOG.json, changelog_manager.py and final_release_notes.txt (paired with the upload) are relative to the repo root
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           VERSION="${{ steps.current_version.outputs.version }}"
 
@@ -263,14 +268,16 @@ jobs:
         env:
           ENV_CONTENT: ${{ secrets.ENV_FILE || secrets.ENV }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
+          m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           if [ "$ENV_MODE" = "dotenv" ]; then
             printf '%s\n' "$ENV_CONTENT" > .env
-            echo ".env file created"
+            m wf_flutter.dotenv_created
           elif [ -n "$ENV_CONTENT" ]; then
             DART_DEFINE_FILE="$RUNNER_TEMP/dart-define.env"
             printf '%s\n' "$ENV_CONTENT" > "$DART_DEFINE_FILE"
             echo "DART_DEFINE_FILE=$DART_DEFINE_FILE" >> "$GITHUB_ENV"
-            echo "dart-define file prepared"
+            m wf_flutter.dart_define_prepared
           fi
 
       - name: Setup Release Keystore
@@ -280,6 +287,7 @@ jobs:
           RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
           RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           # An empty keystore built from an empty Secret leaves it unclear which key signed the build, or ends in a misleading error in a later step
           MISSING=""
@@ -301,6 +309,7 @@ jobs:
 
       - name: Create key.properties
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           cat > android/key.properties << EOF
           storeFile=app/keystore/key.jks
@@ -315,12 +324,14 @@ jobs:
         env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
+          m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           if [ -n "$GOOGLE_SERVICES_JSON" ]; then
             mkdir -p android/app
             printf '%s' "$GOOGLE_SERVICES_JSON" > android/app/google-services.json
-            echo "✅ google-services.json created"
+            m wf_flutter.google_services_created
           else
-            echo "ℹ️ GOOGLE_SERVICES_JSON secret not provided, skipping"
+            m wf_flutter.google_services_skipped
           fi
 
       - name: Set up Flutter
@@ -362,6 +373,7 @@ jobs:
 
       - name: Configure Android build for release
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           # Add the release signing config to build.gradle.kts if it is missing
           if ! grep -q "signingConfigs" android/app/build.gradle.kts; then
@@ -375,6 +387,7 @@ jobs:
 
       - name: Build Android App Bundle (AAB)
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           VERSION_NAME="${{ needs.prepare-build.outputs.version }}"
           VERSION_CODE="${{ needs.prepare-build.outputs.version_code }}"
@@ -437,7 +450,7 @@ jobs:
           # pubspec.yaml stays in x.y.z format; VERSION_CODE is managed automatically in version.yml
           m flutter_a.running_flutter_build
           m flutter_a.command_flutter_build_appbundle_release version_name="$VERSION_NAME" version_code="$VERSION_CODE"
-          m flutter_a.build_start_time cmd1="$(date '+%Y-%m-%d %H:%M:%S')"
+          m flutter_a.build_start_time cmd1="$(date -u '+%Y-%m-%d %H:%M:%S UTC')"
 
           flutter build appbundle \
             --release \
@@ -624,6 +637,7 @@ jobs:
         env:
           SERVICE_ACCOUNT_BASE64: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_JSON_BASE64 }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           if [ -z "$SERVICE_ACCOUNT_BASE64" ]; then
             echo "::error::$(m flutter_a.firebase_service_account_json_base64)"
@@ -658,6 +672,7 @@ jobs:
       - name: Notify Firebase Upload Success
         if: success()
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           m flutter_a.firebase_app_distribution_deployment_succeeded
           m flutter_a.version version="${{ needs.prepare-build.outputs.version }}" version_code="${{ needs.prepare-build.outputs.version_code }}"
@@ -671,6 +686,7 @@ jobs:
       - name: Notify on Failure
         if: failure()
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           m flutter_a.firebase_app_distribution_deployment_failed
           m flutter_a.please_check_logs

package/payload/workflows/flutter/PROJECT-FLUTTER-ANDROID-PLAYSTORE-CICD.yaml

@@ -83,6 +83,7 @@ jobs:
           GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_BASE64 }}
           ANDROID_PACKAGE_NAME: ${{ secrets.ANDROID_PACKAGE_NAME || vars.ANDROID_PACKAGE_NAME }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           MISSING=""
           for NAME in RELEASE_KEYSTORE_BASE64 RELEASE_KEYSTORE_PASSWORD RELEASE_KEY_ALIAS RELEASE_KEY_PASSWORD GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_BASE64; do
@@ -103,14 +104,16 @@ jobs:
         env:
           ENV_CONTENT: ${{ secrets.ENV_FILE || secrets.ENV }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
+          m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           if [ "$ENV_MODE" = "dotenv" ]; then
             printf '%s\n' "$ENV_CONTENT" > .env
-            echo ".env file created"
+            m wf_flutter.dotenv_created
           elif [ -n "$ENV_CONTENT" ]; then
             DART_DEFINE_FILE="$RUNNER_TEMP/dart-define.env"
             printf '%s\n' "$ENV_CONTENT" > "$DART_DEFINE_FILE"
             echo "DART_DEFINE_FILE=$DART_DEFINE_FILE" >> "$GITHUB_ENV"
-            echo "dart-define file prepared"
+            m wf_flutter.dart_define_prepared
           fi
 
       - name: Set up Flutter
@@ -138,6 +141,7 @@ jobs:
         id: current_version
         working-directory: ${{ github.workspace }}   # version_manager.py must read the repo-root version.yml
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           # Get VERSION (x.y.z format)
           VERSION=$(python3 .github/scripts/version_manager.py get | tail -n 1)
@@ -159,13 +163,14 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "VERSION_CODE=$VERSION_CODE" >> $GITHUB_ENV
           echo "TODAY=$(date '+%Y-%m-%d')" >> $GITHUB_ENV
-          echo "TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S')" >> $GITHUB_ENV
+          echo "TIMESTAMP=$(date -u '+%Y-%m-%d %H:%M:%S UTC')" >> $GITHUB_ENV
           echo "PROJECT_TYPE=${{ env.PROJECT_TYPE }}" >> $GITHUB_ENV
 
       - name: Generate release notes
         id: release_notes
         working-directory: ${{ github.workspace }}   # CHANGELOG.json, changelog_manager.py and final_release_notes.txt (paired with the upload) are relative to the repo root
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           VERSION="${{ steps.current_version.outputs.version }}"
 
@@ -245,14 +250,16 @@ jobs:
         env:
           ENV_CONTENT: ${{ secrets.ENV_FILE || secrets.ENV }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
+          m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           if [ "$ENV_MODE" = "dotenv" ]; then
             printf '%s\n' "$ENV_CONTENT" > .env
-            echo ".env file created"
+            m wf_flutter.dotenv_created
           elif [ -n "$ENV_CONTENT" ]; then
             DART_DEFINE_FILE="$RUNNER_TEMP/dart-define.env"
             printf '%s\n' "$ENV_CONTENT" > "$DART_DEFINE_FILE"
             echo "DART_DEFINE_FILE=$DART_DEFINE_FILE" >> "$GITHUB_ENV"
-            echo "dart-define file prepared"
+            m wf_flutter.dart_define_prepared
           fi
 
       - name: Setup Release Keystore
@@ -262,6 +269,7 @@ jobs:
           RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
           RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           # An empty keystore built from an empty Secret leaves it unclear which key signed the build, or ends in a misleading error in a later step
           MISSING=""
@@ -283,6 +291,7 @@ jobs:
 
       - name: Create key.properties
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           cat > android/key.properties << EOF
           storeFile=app/keystore/key.jks
@@ -297,12 +306,14 @@ jobs:
         env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
+          m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           if [ -n "$GOOGLE_SERVICES_JSON" ]; then
             mkdir -p android/app
             printf '%s' "$GOOGLE_SERVICES_JSON" > android/app/google-services.json
-            echo "✅ google-services.json created"
+            m wf_flutter.google_services_created
           else
-            echo "ℹ️ GOOGLE_SERVICES_JSON secret not provided, skipping"
+            m wf_flutter.google_services_skipped
           fi
 
       - name: Set up Flutter
@@ -344,6 +355,7 @@ jobs:
 
       - name: Configure Android build for release
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           # Add the release signing config to build.gradle.kts if it is missing
           if ! grep -q "signingConfigs" android/app/build.gradle.kts; then
@@ -357,6 +369,7 @@ jobs:
 
       - name: Build Android App Bundle (AAB)
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           VERSION_NAME="${{ needs.prepare-build.outputs.version }}"
           VERSION_CODE="${{ needs.prepare-build.outputs.version_code }}"
@@ -419,7 +432,7 @@ jobs:
           # pubspec.yaml stays in x.y.z format; VERSION_CODE is managed automatically in version.yml
           m flutter_a.running_flutter_build
           m flutter_a.command_flutter_build_appbundle_release version_name="$VERSION_NAME" version_code="$VERSION_CODE"
-          m flutter_a.build_start_time cmd1="$(date '+%Y-%m-%d %H:%M:%S')"
+          m flutter_a.build_start_time cmd1="$(date -u '+%Y-%m-%d %H:%M:%S UTC')"
 
           flutter build appbundle \
             --release \
@@ -598,6 +611,7 @@ jobs:
         env:
           SERVICE_ACCOUNT_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_BASE64 }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           if [ -z "$SERVICE_ACCOUNT_BASE64" ]; then
             echo "::error::$(m flutter_a.google_play_service_account_json)"
@@ -627,6 +641,7 @@ jobs:
       - name: Install Fastlane
         working-directory: ${{ env.FLUTTER_PROJECT_DIR }}/android
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           # If the repository Gemfile has fastlane, use it as is (committing Gemfile.lock is recommended). Otherwise create one.
           if [ -f Gemfile ] && grep -Eq "['\"]fastlane['\"]" Gemfile; then
@@ -643,6 +658,7 @@ jobs:
       # Use android/fastlane/Fastfile.playstore to stay consistent
       - name: Copy Fastfile for Play Store
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           mkdir -p android/fastlane
           cp android/fastlane/Fastfile.playstore android/fastlane/Fastfile
@@ -655,12 +671,13 @@ jobs:
           DEPLOY_MODE: ${{ env.DEPLOY_MODE }}
           PACKAGE_NAME: ${{ secrets.ANDROID_PACKAGE_NAME || vars.ANDROID_PACKAGE_NAME }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           echo "=========================================="
           m flutter_a.starting_play_store_deployment
           echo "=========================================="
-          m flutter_a.deploy_start_time cmd1="$(date '+%Y-%m-%d %H:%M:%S')"
-          echo "🔍 GitHub Run Number: ${{ github.run_number }}"
+          m flutter_a.deploy_start_time cmd1="$(date -u '+%Y-%m-%d %H:%M:%S UTC')"
+          m wf_flutter.run_number number="${{ github.run_number }}"
           echo "🔍 GitHub SHA: ${{ github.sha }}"
           
           # Initialize and validate environment variables
@@ -768,6 +785,7 @@ jobs:
       - name: Notify Play Store Upload Success
         if: success()
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           m flutter_a.play_store_internal_testing_deployment
           m flutter_a.version version="${{ needs.prepare-build.outputs.version }}" version_code="${{ needs.prepare-build.outputs.version_code }}"
@@ -781,6 +799,7 @@ jobs:
       - name: Notify on Failure
         if: failure()
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { (cd "$GITHUB_WORKSPACE" && python3 .github/scripts/messages.py get "$@"); }
           m flutter_a.play_store_deployment_failed
           m flutter_a.please_check_logs