project-auto-wizard 0.15.0 → 0.15.1

package/payload/workflows/flutter/PROJECT-FLUTTER-ANDROID-TEST-APK.yaml

@@ -82,6 +82,7 @@ jobs:
       issue_number: ${{ steps.issue_info.outputs.issue_number }}
       branch_name: ${{ steps.issue_info.outputs.branch_name }}
       commit_hash: ${{ steps.build_info.outputs.commit_hash }}
+      commit_sha: ${{ steps.build_info.outputs.commit_sha }}
       pr_number: ${{ steps.build_info.outputs.pr_number }}
       build_number: ${{ steps.build_info.outputs.build_number }}
       progress_comment_id: ${{ steps.progress_comment.outputs.comment_id }}
@@ -102,6 +103,7 @@ jobs:
       - name: Load messages
         working-directory: ${{ github.workspace }}
         run: |
+          [ -f .paw-msg/.github/scripts/messages.py ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           cp .paw-msg/.github/scripts/messages.py "$RUNNER_TEMP/paw_messages.py"
           LANG_CODE=$(cd .paw-msg && python3 "$RUNNER_TEMP/paw_messages.py" lang)
           rm -rf .paw-msg
@@ -113,14 +115,18 @@ jobs:
         id: verify_branch
         if: github.event_name == 'repository_dispatch'
         uses: actions/github-script@v9
+        env:
+          PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_BRANCH_NAME: ${{ github.event.client_payload.branch_name }}
+          PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_PR_NUMBER: ${{ github.event.client_payload.pr_number }}
+          PAW_IN_GITHUB_RUN_ID: ${{ github.run_id }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const M = JSON.parse(process.env.PAW_MSG);
             const msg = (k, p = {}) => M[k].replace(/\{(\w+)\}/g, (s, n) => (n in p ? p[n] : s));
-            const branchName = '${{ github.event.client_payload.branch_name }}';
-            const prNumber = '${{ github.event.client_payload.pr_number }}';
-            const runId = '${{ github.run_id }}';
+            const branchName = process.env.PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_BRANCH_NAME;
+            const prNumber = process.env.PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_PR_NUMBER;
+            const runId = process.env.PAW_IN_GITHUB_RUN_ID;
             const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
 
             console.log(msg('apk_test.branch_check_log', { branch: branchName }));
@@ -184,17 +190,21 @@ jobs:
         id: progress_comment
         if: github.event_name == 'repository_dispatch' && github.event.client_payload.pr_number != ''
         uses: actions/github-script@v9
+        env:
+          PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_PR_NUMBER: ${{ github.event.client_payload.pr_number }}
+          PAW_IN_GITHUB_RUN_ID: ${{ github.run_id }}
+          PAW_IN_STEPS_FIREBASE_CHECK_OUTPUTS_AVAILABLE: ${{ steps.firebase_check.outputs.available }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const M = JSON.parse(process.env.PAW_MSG);
             const msg = (k, p = {}) => M[k].replace(/\{(\w+)\}/g, (s, n) => (n in p ? p[n] : s));
             const row = (name, status, elapsed = '-') => `| ${msg('apk_test.step_' + name)} | ${msg('apk_test.st_' + status)} | ${elapsed} |`;
-            const prNumber = parseInt('${{ github.event.client_payload.pr_number }}');
-            const runId = '${{ github.run_id }}';
+            const prNumber = parseInt(process.env.PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_PR_NUMBER);
+            const runId = process.env.PAW_IN_GITHUB_RUN_ID;
             const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
             const startTime = Date.now();
-            const firebaseAvailable = '${{ steps.firebase_check.outputs.available }}' === 'true';
+            const firebaseAvailable = process.env.PAW_IN_STEPS_FIREBASE_CHECK_OUTPUTS_AVAILABLE === 'true';
 
             const rows = [
               row('prepare', 'running'),
@@ -233,22 +243,28 @@ jobs:
           ref: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref }}
 
       - name: Pull latest changes
+        env:
+          PAW_BRANCH_NAME: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}
         run: |
           m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
-          BRANCH_NAME="${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}"
+          BRANCH_NAME="$PAW_BRANCH_NAME"
           m apk_test.pull_branch branch="$BRANCH_NAME"
           git pull origin "$BRANCH_NAME" || m apk_test.pull_failed
 
       - name: Extract issue info from the branch name
         id: issue_info
+        env:
+          PAW_BRANCH_NAME: ${{ github.event.client_payload.branch_name }}
+          PAW_ISSUE_NUMBER: ${{ github.event.client_payload.issue_number }}
+          PAW_REF_NAME: ${{ github.ref_name }}
         run: |
           m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
           # For repository_dispatch, take the branch name from client_payload
           if [ "${{ github.event_name }}" == "repository_dispatch" ]; then
-            BRANCH_NAME="${{ github.event.client_payload.branch_name }}"
-            ISSUE_NUMBER="${{ github.event.client_payload.issue_number }}"
+            BRANCH_NAME="$PAW_BRANCH_NAME"
+            ISSUE_NUMBER="$PAW_ISSUE_NUMBER"
           else
-            BRANCH_NAME="${{ github.ref_name }}"
+            BRANCH_NAME="$PAW_REF_NAME"
             # Extract the issue number from the branch name (`<date>_#<number>_...` format)
             ISSUE_NUMBER=$(echo "$BRANCH_NAME" | sed -n 's/.*#\([0-9]*\).*/\1/p')
           fi
@@ -288,20 +304,24 @@ jobs:
 
       - name: Generate build info
         id: build_info
+        env:
+          PAW_BUILD_NUMBER: ${{ github.event.client_payload.build_number }}
+          PAW_PR_NUMBER: ${{ github.event.client_payload.pr_number }}
         run: |
           m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
           # Get the version through version_manager.py (same approach as the production workflow)
           VERSION=$(python3 .github/scripts/version_manager.py get | tail -n 1)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-          COMMIT_SHA="${{ github.sha }}"
+          # github.sha is the default-branch commit for repository_dispatch; report the commit actually checked out
+          COMMIT_SHA=$(git rev-parse HEAD)
           COMMIT_SHORT=$(echo "$COMMIT_SHA" | cut -c1-7)
-          BUILD_DATE=$(date '+%Y-%m-%d %H:%M:%S')
+          BUILD_DATE=$(date -u '+%Y-%m-%d %H:%M:%S UTC')
 
           # For repository_dispatch events, use the PR number as the build number
           if [ "${{ github.event_name }}" == "repository_dispatch" ]; then
-            BUILD_NUMBER="${{ github.event.client_payload.build_number }}"
-            PR_NUMBER="${{ github.event.client_payload.pr_number }}"
+            BUILD_NUMBER="$PAW_BUILD_NUMBER"
+            PR_NUMBER="$PAW_PR_NUMBER"
             m apk_test.event_dispatch
             m apk_test.event_pr_number pr="$PR_NUMBER"
             m apk_test.event_build_number_pr build="$BUILD_NUMBER"
@@ -313,6 +333,7 @@ jobs:
           fi
 
           echo "commit_hash=$COMMIT_SHORT" >> $GITHUB_OUTPUT
+          echo "commit_sha=$COMMIT_SHA" >> $GITHUB_OUTPUT
           echo "build_number=$BUILD_NUMBER" >> $GITHUB_OUTPUT
           echo "pr_number=$PR_NUMBER" >> $GITHUB_OUTPUT
           echo "build_date=$BUILD_DATE" >> $GITHUB_OUTPUT
@@ -345,8 +366,10 @@ jobs:
           sparse-checkout-cone-mode: false
 
       - name: Load messages
+        id: load_messages
         working-directory: ${{ github.workspace }}
         run: |
+          [ -f .paw-msg/.github/scripts/messages.py ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           cp .paw-msg/.github/scripts/messages.py "$RUNNER_TEMP/paw_messages.py"
           LANG_CODE=$(cd .paw-msg && python3 "$RUNNER_TEMP/paw_messages.py" lang)
           rm -rf .paw-msg
@@ -361,21 +384,24 @@ jobs:
           ref: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref }}
 
       - name: Pull latest changes
-        run: git pull origin ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}
+        env:
+          PAW_BRANCH_NAME: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}
+        run: git pull origin "$PAW_BRANCH_NAME"
 
       # Prepare env vars — a .env file when ENV_MODE=dotenv, otherwise a temp file outside the project (--dart-define-from-file)
       - name: Prepare env file
         env:
           ENV_CONTENT: ${{ secrets.ENV_FILE || secrets.ENV }}
         run: |
+          m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
           if [ "$ENV_MODE" = "dotenv" ]; then
             printf '%s\n' "$ENV_CONTENT" > "$ENV_FILE_PATH"
-            echo "✅ $ENV_FILE_PATH file created"
+            m wf_flutter.env_file_created file="$ENV_FILE_PATH"
           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
@@ -433,12 +459,13 @@ jobs:
         env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
         run: |
+          m() { python3 "$PAW_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
@@ -450,7 +477,8 @@ jobs:
 
       - name: Verify Flutter version
         run: |
-          echo "✅ Flutter setup completed"
+          m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
+          m wf_flutter.flutter_setup_done_ok
           flutter --version
 
       - name: Cache Flutter dependencies
@@ -472,11 +500,12 @@ jobs:
 
       - name: Install dependencies
         run: |
+          m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
           flutter pub get
           if grep -q "build_runner" pubspec.yaml; then
             dart run build_runner build --delete-conflicting-outputs
           fi
-          echo "✅ Dependencies installed"
+          m wf_flutter.deps_installed_ok
 
       - name: Setup Gradle
         working-directory: ${{ env.FLUTTER_PROJECT_DIR }}/android
@@ -485,7 +514,7 @@ jobs:
           # The default flutter create .gitignore does not commit gradlew — flutter build creates it when missing
           if [ -f gradlew ]; then
             chmod +x gradlew
-            echo "✅ Gradle wrapper permissions set"
+            m wf_flutter.gradle_perm_ok
           else
             m apk_test.gradlew_missing
           fi
@@ -498,22 +527,28 @@ jobs:
 
       - name: Verify Java version
         run: |
-          echo "✅ Java setup completed"
+          m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
+          m wf_flutter.java_setup_done_ok
           java -version
 
       - name: Progress - prepare done
         id: progress_step1
         if: github.event_name == 'repository_dispatch' && needs.prepare-test-build.outputs.progress_comment_id != ''
         uses: actions/github-script@v9
+        env:
+          PAW_IN_GITHUB_RUN_ID: ${{ github.run_id }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_FIREBASE_AVAILABLE: ${{ needs.prepare-test-build.outputs.firebase_available }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_COMMENT_ID: ${{ needs.prepare-test-build.outputs.progress_comment_id }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_START_TIME: ${{ needs.prepare-test-build.outputs.progress_start_time }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const M = JSON.parse(process.env.PAW_MSG);
             const msg = (k, p = {}) => M[k].replace(/\{(\w+)\}/g, (s, n) => (n in p ? p[n] : s));
             const row = (name, status, elapsed = '-') => `| ${msg('apk_test.step_' + name)} | ${msg('apk_test.st_' + status)} | ${elapsed} |`;
-            const commentId = parseInt('${{ needs.prepare-test-build.outputs.progress_comment_id }}');
-            const startTime = parseInt('${{ needs.prepare-test-build.outputs.progress_start_time }}');
-            const runId = '${{ github.run_id }}';
+            const commentId = parseInt(process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_COMMENT_ID);
+            const startTime = parseInt(process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_START_TIME);
+            const runId = process.env.PAW_IN_GITHUB_RUN_ID;
             const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
 
             const now = Date.now();
@@ -521,7 +556,7 @@ jobs:
             const minutes = Math.floor(elapsed / 60);
             const seconds = elapsed % 60;
             const elapsedStr = minutes > 0 ? msg('apk_test.elapsed_min_sec', { m: minutes, s: seconds }) : msg('apk_test.elapsed_sec', { s: seconds });
-            const firebaseAvailable = '${{ needs.prepare-test-build.outputs.firebase_available }}' === 'true';
+            const firebaseAvailable = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_FIREBASE_AVAILABLE === 'true';
 
             const rows = [
               row('prepare', 'done', elapsedStr),
@@ -555,13 +590,15 @@ jobs:
 
       - name: Generate APK filename
         id: apk_filename
+        env:
+          PAW_ISSUE_TITLE: ${{ needs.prepare-test-build.outputs.issue_title }}
         run: |
           m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
           REPO_NAME="${{ github.event.repository.name }}"
           COMMIT_SHORT="${{ needs.prepare-test-build.outputs.commit_hash }}"
           BUILD_NUMBER="${{ needs.prepare-test-build.outputs.build_number }}"
           ISSUE_NUMBER="${{ needs.prepare-test-build.outputs.issue_number }}"
-          ISSUE_TITLE="${{ needs.prepare-test-build.outputs.issue_title }}"
+          ISSUE_TITLE="$PAW_ISSUE_TITLE"
 
           # Clean up the issue title
           CLEAN_TITLE=""
@@ -617,7 +654,7 @@ jobs:
           m apk_test.flutter_build_log
           flutter build apk --release ${DART_DEFINE_FILE:+--dart-define-from-file="$DART_DEFINE_FILE"}
           ls -la ./build/app/outputs/flutter-apk/ || true
-          echo "✅ APK built"
+          m wf_flutter.apk_built_ok
 
       - name: Rename and Prepare APK
         run: |
@@ -625,7 +662,7 @@ jobs:
           mkdir -p ./android/app/build/outputs/apk/release/
           APK_NAME="${{ steps.apk_filename.outputs.apk_name }}"
           mv ./build/app/outputs/flutter-apk/app-release.apk ./android/app/build/outputs/apk/release/${APK_NAME}
-          echo "✅ APK renamed to ${APK_NAME}"
+          m wf_flutter.apk_renamed_ok name="${APK_NAME}"
           ls -la ./android/app/build/outputs/apk/release/
 
           # Check the APK file size
@@ -644,16 +681,22 @@ jobs:
         id: progress_step2
         if: github.event_name == 'repository_dispatch' && needs.prepare-test-build.outputs.progress_comment_id != ''
         uses: actions/github-script@v9
+        env:
+          PAW_IN_GITHUB_RUN_ID: ${{ github.run_id }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_FIREBASE_AVAILABLE: ${{ needs.prepare-test-build.outputs.firebase_available }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_COMMENT_ID: ${{ needs.prepare-test-build.outputs.progress_comment_id }}
+          PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_ELAPSED: ${{ steps.progress_step1.outputs.elapsed }}
+          PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_END_TIME: ${{ steps.progress_step1.outputs.end_time }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const M = JSON.parse(process.env.PAW_MSG);
             const msg = (k, p = {}) => M[k].replace(/\{(\w+)\}/g, (s, n) => (n in p ? p[n] : s));
             const row = (name, status, elapsed = '-') => `| ${msg('apk_test.step_' + name)} | ${msg('apk_test.st_' + status)} | ${elapsed} |`;
-            const commentId = parseInt('${{ needs.prepare-test-build.outputs.progress_comment_id }}');
-            const step1EndTime = parseInt('${{ steps.progress_step1.outputs.end_time }}');
-            const step1Elapsed = '${{ steps.progress_step1.outputs.elapsed }}';
-            const runId = '${{ github.run_id }}';
+            const commentId = parseInt(process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_COMMENT_ID);
+            const step1EndTime = parseInt(process.env.PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_END_TIME);
+            const step1Elapsed = process.env.PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_ELAPSED;
+            const runId = process.env.PAW_IN_GITHUB_RUN_ID;
             const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
 
             const now = Date.now();
@@ -661,7 +704,7 @@ jobs:
             const minutes = Math.floor(elapsed / 60);
             const seconds = elapsed % 60;
             const elapsedStr = minutes > 0 ? msg('apk_test.elapsed_min_sec', { m: minutes, s: seconds }) : msg('apk_test.elapsed_sec', { s: seconds });
-            const firebaseAvailable = '${{ needs.prepare-test-build.outputs.firebase_available }}' === 'true';
+            const firebaseAvailable = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_FIREBASE_AVAILABLE === 'true';
 
             const rows = [
               row('prepare', 'done', step1Elapsed || '-'),
@@ -694,14 +737,17 @@ jobs:
             core.setOutput('end_time', now.toString());
 
       - name: Create build info file
+        env:
+          PAW_BRANCH_NAME: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}
+          PAW_ISSUE_TITLE: ${{ needs.prepare-test-build.outputs.issue_title }}
         run: |
           m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
           BUILD_NUMBER="${{ needs.prepare-test-build.outputs.build_number }}"
           PR_NUMBER="${{ needs.prepare-test-build.outputs.pr_number }}"
-          BRANCH_NAME="${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}"
-          COMMIT_SHA="${{ github.sha }}"
+          BRANCH_NAME="$PAW_BRANCH_NAME"
+          COMMIT_SHA="${{ needs.prepare-test-build.outputs.commit_sha }}"
           COMMIT_SHORT="${{ needs.prepare-test-build.outputs.commit_hash }}"
-          BUILD_DATE=$(date '+%Y-%m-%d %H:%M:%S')
+          BUILD_DATE=$(date -u '+%Y-%m-%d %H:%M:%S UTC')
 
           {
             m apk_test.info_title
@@ -724,7 +770,7 @@ jobs:
           # Add the issue info when available
           if [ -n "${{ needs.prepare-test-build.outputs.issue_number }}" ]; then
             ISSUE_NUMBER="${{ needs.prepare-test-build.outputs.issue_number }}"
-            ISSUE_TITLE="${{ needs.prepare-test-build.outputs.issue_title }}"
+            ISSUE_TITLE="$PAW_ISSUE_TITLE"
             ISSUE_URL="${{ needs.prepare-test-build.outputs.issue_url }}"
 
             {
@@ -740,13 +786,15 @@ jobs:
 
       # Create the build metadata file (for the comment-posting workflow)
       - name: Create build metadata file
+        env:
+          PAW_BRANCH_NAME: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}
         run: |
           cat > build-metadata.json << EOF
           {
             "pr_number": "${{ needs.prepare-test-build.outputs.pr_number }}",
             "build_number": "${{ needs.prepare-test-build.outputs.build_number }}",
             "issue_number": "${{ needs.prepare-test-build.outputs.issue_number }}",
-            "branch_name": "${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}"
+            "branch_name": "$PAW_BRANCH_NAME"
           }
           EOF
           cat build-metadata.json
@@ -768,11 +816,13 @@ jobs:
         id: artifact_time
         if: github.event_name == 'repository_dispatch' && needs.prepare-test-build.outputs.progress_comment_id != ''
         uses: actions/github-script@v9
+        env:
+          PAW_IN_STEPS_PROGRESS_STEP2_OUTPUTS_END_TIME: ${{ steps.progress_step2.outputs.end_time }}
         with:
           script: |
             const M = JSON.parse(process.env.PAW_MSG);
             const msg = (k, p = {}) => M[k].replace(/\{(\w+)\}/g, (s, n) => (n in p ? p[n] : s));
-            const step2EndTime = parseInt('${{ steps.progress_step2.outputs.end_time }}');
+            const step2EndTime = parseInt(process.env.PAW_IN_STEPS_PROGRESS_STEP2_OUTPUTS_END_TIME);
             const now = Date.now();
             const elapsed = Math.round((now - step2EndTime) / 1000);
             const minutes = Math.floor(elapsed / 60);
@@ -845,11 +895,13 @@ jobs:
         id: firebase_time
         if: needs.prepare-test-build.outputs.firebase_available == 'true' && github.event_name == 'repository_dispatch' && needs.prepare-test-build.outputs.progress_comment_id != ''
         uses: actions/github-script@v9
+        env:
+          PAW_IN_STEPS_ARTIFACT_TIME_OUTPUTS_END_TIME: ${{ steps.artifact_time.outputs.end_time }}
         with:
           script: |
             const M = JSON.parse(process.env.PAW_MSG);
             const msg = (k, p = {}) => M[k].replace(/\{(\w+)\}/g, (s, n) => (n in p ? p[n] : s));
-            const artifactEndTime = parseInt('${{ steps.artifact_time.outputs.end_time }}');
+            const artifactEndTime = parseInt(process.env.PAW_IN_STEPS_ARTIFACT_TIME_OUTPUTS_END_TIME);
             const now = Date.now();
             const elapsed = Math.round((now - artifactEndTime) / 1000);
             const minutes = Math.floor(elapsed / 60);
@@ -860,27 +912,44 @@ jobs:
       - name: Final progress update - success
         if: success() && github.event_name == 'repository_dispatch' && github.event.client_payload.pr_number != '' && needs.prepare-test-build.outputs.progress_comment_id != ''
         uses: actions/github-script@v9
+        env:
+          PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_PR_NUMBER: ${{ github.event.client_payload.pr_number }}
+          PAW_IN_GITHUB_RUN_ID: ${{ github.run_id }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_BRANCH_NAME: ${{ needs.prepare-test-build.outputs.branch_name }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_BUILD_NUMBER: ${{ needs.prepare-test-build.outputs.build_number }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_COMMIT_HASH: ${{ needs.prepare-test-build.outputs.commit_hash }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_FIREBASE_AVAILABLE: ${{ needs.prepare-test-build.outputs.firebase_available }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_ISSUE_NUMBER: ${{ needs.prepare-test-build.outputs.issue_number }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_COMMENT_ID: ${{ needs.prepare-test-build.outputs.progress_comment_id }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_START_TIME: ${{ needs.prepare-test-build.outputs.progress_start_time }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_VERSION: ${{ needs.prepare-test-build.outputs.version }}
+          PAW_IN_STEPS_ARTIFACT_TIME_OUTPUTS_ELAPSED: ${{ steps.artifact_time.outputs.elapsed }}
+          PAW_IN_STEPS_FIREBASE_RESULT_OUTPUTS_STATUS: ${{ steps.firebase_result.outputs.status }}
+          PAW_IN_STEPS_FIREBASE_TIME_OUTPUTS_ELAPSED: ${{ steps.firebase_time.outputs.elapsed }}
+          PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_ELAPSED: ${{ steps.progress_step1.outputs.elapsed }}
+          PAW_IN_STEPS_PROGRESS_STEP2_OUTPUTS_ELAPSED: ${{ steps.progress_step2.outputs.elapsed }}
+          PAW_IN_STEPS_UPLOAD_ARTIFACT_OUTPUTS_ARTIFACT_URL: ${{ steps.upload_artifact.outputs.artifact-url }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const M = JSON.parse(process.env.PAW_MSG);
             const msg = (k, p = {}) => M[k].replace(/\{(\w+)\}/g, (s, n) => (n in p ? p[n] : s));
             const row = (name, status, elapsed = '-') => `| ${msg('apk_test.step_' + name)} | ${msg('apk_test.st_' + status)} | ${elapsed} |`;
-            const commentId = parseInt('${{ needs.prepare-test-build.outputs.progress_comment_id }}');
-            const startTime = parseInt('${{ needs.prepare-test-build.outputs.progress_start_time }}');
-            const step1Elapsed = '${{ steps.progress_step1.outputs.elapsed }}';
-            const step2Elapsed = '${{ steps.progress_step2.outputs.elapsed }}';
-            const step3Elapsed = '${{ steps.artifact_time.outputs.elapsed }}';
-            const step4Elapsed = '${{ steps.firebase_time.outputs.elapsed }}';
-            const prNumber = parseInt('${{ github.event.client_payload.pr_number }}');
-            const buildNumber = '${{ needs.prepare-test-build.outputs.build_number }}';
-            const branchName = '${{ needs.prepare-test-build.outputs.branch_name }}';
-            const commitHash = '${{ needs.prepare-test-build.outputs.commit_hash }}';
-            const issueNumber = '${{ needs.prepare-test-build.outputs.issue_number }}';
-            const runId = '${{ github.run_id }}';
+            const commentId = parseInt(process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_COMMENT_ID);
+            const startTime = parseInt(process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_START_TIME);
+            const step1Elapsed = process.env.PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_ELAPSED;
+            const step2Elapsed = process.env.PAW_IN_STEPS_PROGRESS_STEP2_OUTPUTS_ELAPSED;
+            const step3Elapsed = process.env.PAW_IN_STEPS_ARTIFACT_TIME_OUTPUTS_ELAPSED;
+            const step4Elapsed = process.env.PAW_IN_STEPS_FIREBASE_TIME_OUTPUTS_ELAPSED;
+            const prNumber = parseInt(process.env.PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_PR_NUMBER);
+            const buildNumber = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_BUILD_NUMBER;
+            const branchName = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_BRANCH_NAME;
+            const commitHash = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_COMMIT_HASH;
+            const issueNumber = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_ISSUE_NUMBER;
+            const runId = process.env.PAW_IN_GITHUB_RUN_ID;
             const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
 
-            const artifactUrl = '${{ steps.upload_artifact.outputs.artifact-url }}' || `${runUrl}#artifacts`;
+            const artifactUrl = process.env.PAW_IN_STEPS_UPLOAD_ARTIFACT_OUTPUTS_ARTIFACT_URL || `${runUrl}#artifacts`;
 
             const now = Date.now();
             const totalElapsed_s = Math.round((now - startTime) / 1000);
@@ -888,8 +957,8 @@ jobs:
             const totalSec = totalElapsed_s % 60;
             const totalElapsed = totalMin > 0 ? msg('apk_test.elapsed_min_sec', { m: totalMin, s: totalSec }) : msg('apk_test.elapsed_sec', { s: totalSec });
 
-            const firebaseAvailable = '${{ needs.prepare-test-build.outputs.firebase_available }}' === 'true';
-            const firebaseSuccess = '${{ steps.firebase_result.outputs.status }}' === 'success';
+            const firebaseAvailable = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_FIREBASE_AVAILABLE === 'true';
+            const firebaseSuccess = process.env.PAW_IN_STEPS_FIREBASE_RESULT_OUTPUTS_STATUS === 'success';
 
             const lines = [
               msg('apk_test.title_done'),
@@ -909,7 +978,7 @@ jobs:
               }
             }
 
-            const version = '${{ needs.prepare-test-build.outputs.version }}';
+            const version = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_VERSION;
 
             lines.push(
               '',
@@ -973,24 +1042,36 @@ jobs:
             }
 
       - name: Final progress update - failure
-        if: failure() && github.event_name == 'repository_dispatch' && github.event.client_payload.pr_number != '' && needs.prepare-test-build.outputs.progress_comment_id != ''
+        if: failure() && steps.load_messages.outcome == 'success' && github.event_name == 'repository_dispatch' && github.event.client_payload.pr_number != '' && needs.prepare-test-build.outputs.progress_comment_id != ''
         uses: actions/github-script@v9
+        env:
+          PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_PR_NUMBER: ${{ github.event.client_payload.pr_number }}
+          PAW_IN_GITHUB_RUN_ID: ${{ github.run_id }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_BRANCH_NAME: ${{ needs.prepare-test-build.outputs.branch_name }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_BUILD_NUMBER: ${{ needs.prepare-test-build.outputs.build_number }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_FIREBASE_AVAILABLE: ${{ needs.prepare-test-build.outputs.firebase_available }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_ISSUE_NUMBER: ${{ needs.prepare-test-build.outputs.issue_number }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_COMMENT_ID: ${{ needs.prepare-test-build.outputs.progress_comment_id }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_START_TIME: ${{ needs.prepare-test-build.outputs.progress_start_time }}
+          PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_VERSION: ${{ needs.prepare-test-build.outputs.version }}
+          PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_ELAPSED: ${{ steps.progress_step1.outputs.elapsed }}
+          PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_END_TIME: ${{ steps.progress_step1.outputs.end_time }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const M = JSON.parse(process.env.PAW_MSG);
             const msg = (k, p = {}) => M[k].replace(/\{(\w+)\}/g, (s, n) => (n in p ? p[n] : s));
             const row = (name, status, elapsed = '-') => `| ${msg('apk_test.step_' + name)} | ${msg('apk_test.st_' + status)} | ${elapsed} |`;
-            const commentId = parseInt('${{ needs.prepare-test-build.outputs.progress_comment_id }}');
-            const startTime = parseInt('${{ needs.prepare-test-build.outputs.progress_start_time }}');
-            const step1EndTime = parseInt('${{ steps.progress_step1.outputs.end_time }}') || 0;
-            const step1Elapsed = '${{ steps.progress_step1.outputs.elapsed }}';
-            const prNumber = parseInt('${{ github.event.client_payload.pr_number }}');
-            const buildNumber = '${{ needs.prepare-test-build.outputs.build_number }}';
-            const version = '${{ needs.prepare-test-build.outputs.version }}';
-            const branchName = '${{ needs.prepare-test-build.outputs.branch_name }}';
-            const issueNumber = '${{ needs.prepare-test-build.outputs.issue_number }}';
-            const runId = '${{ github.run_id }}';
+            const commentId = parseInt(process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_COMMENT_ID);
+            const startTime = parseInt(process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_PROGRESS_START_TIME);
+            const step1EndTime = parseInt(process.env.PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_END_TIME) || 0;
+            const step1Elapsed = process.env.PAW_IN_STEPS_PROGRESS_STEP1_OUTPUTS_ELAPSED;
+            const prNumber = parseInt(process.env.PAW_IN_GITHUB_EVENT_CLIENT_PAYLOAD_PR_NUMBER);
+            const buildNumber = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_BUILD_NUMBER;
+            const version = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_VERSION;
+            const branchName = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_BRANCH_NAME;
+            const issueNumber = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_ISSUE_NUMBER;
+            const runId = process.env.PAW_IN_GITHUB_RUN_ID;
             const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}`;
 
             const now = Date.now();
@@ -1008,7 +1089,7 @@ jobs:
             const tSec = total_s % 60;
             const totalElapsed = tMin > 0 ? msg('apk_test.elapsed_min_sec', { m: tMin, s: tSec }) : msg('apk_test.elapsed_sec', { s: tSec });
 
-            const firebaseAvailable = '${{ needs.prepare-test-build.outputs.firebase_available }}' === 'true';
+            const firebaseAvailable = process.env.PAW_IN_NEEDS_PREPARE_TEST_BUILD_OUTPUTS_FIREBASE_AVAILABLE === 'true';
 
             const rows = [
               row('prepare', 'done', step1Elapsed || '-'),
@@ -1066,6 +1147,8 @@ jobs:
 
       - name: Notify Build Success
         if: success()
+        env:
+          PAW_BRANCH_NAME: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}
         run: |
           m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
           m apk_test.notify_ok
@@ -1073,7 +1156,7 @@ jobs:
           if [ -n "${{ needs.prepare-test-build.outputs.pr_number }}" ]; then
             m apk_test.notify_pr pr="${{ needs.prepare-test-build.outputs.pr_number }}"
           fi
-          m apk_test.notify_branch branch="${{ github.event_name == 'repository_dispatch' && github.event.client_payload.branch_name || github.ref_name }}"
+          m apk_test.notify_branch branch="$PAW_BRANCH_NAME"
           m apk_test.notify_commit commit="${{ needs.prepare-test-build.outputs.commit_hash }}"
           if [ -n "${{ needs.prepare-test-build.outputs.issue_url }}" ]; then
             m apk_test.notify_issue url="${{ needs.prepare-test-build.outputs.issue_url }}"
@@ -1082,7 +1165,7 @@ jobs:
           m apk_test.notify_artifact_hint
 
       - name: Notify on Failure
-        if: failure()
+        if: failure() && steps.load_messages.outcome == 'success'
         run: |
           m() { python3 "$PAW_MESSAGES_PY" get "$@"; }
           m apk_test.notify_fail