From 0eeb95c11fadf0aa372580256ccbb62fc5d86915 Mon Sep 17 00:00:00 2001
From: Drew Jacobs <drewjacobs@Drews-MacBook-Air.local>
Date: Fri, 13 Mar 2026 18:58:33 +0900
Subject: [PATCH] Fix admin smoke workflow resolution

---
 .github/workflows/fly-deploy.yml  | 17 +++++++++++++----
 .github/workflows/fly-preview.yml | 20 ++++++++++++++++----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml
index 57dc870..c5fb31e 100644
--- a/.github/workflows/fly-deploy.yml
+++ b/.github/workflows/fly-deploy.yml
@@ -96,13 +96,22 @@ jobs:
       - run: flyctl deploy --remote-only --strategy immediate --config fly.toml --build-arg DJD_RELEASE_SHA=${GITHUB_SHA} --build-arg DJD_BUILD_TIMESTAMP=${DJD_BUILD_TIMESTAMP}
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-      - name: Warn when admin smoke verification is disabled
-        if: ${{ secrets.DJD_ADMIN_KEY == '' && secrets.ADMIN_KEY == '' }}
-        run: echo "::warning::DJD_ADMIN_KEY/ADMIN_KEY secret not set; post-deploy smoke will skip admin runtime verification."
+      - name: Resolve admin smoke key
+        env:
+          DJD_ADMIN_KEY_PRIMARY: ${{ secrets.DJD_ADMIN_KEY }}
+          DJD_ADMIN_KEY_LEGACY: ${{ secrets.ADMIN_KEY }}
+        run: |
+          if [ -n "$DJD_ADMIN_KEY_PRIMARY" ]; then
+            echo "DJD_SMOKE_ADMIN_KEY=$DJD_ADMIN_KEY_PRIMARY" >> "$GITHUB_ENV"
+          elif [ -n "$DJD_ADMIN_KEY_LEGACY" ]; then
+            echo "DJD_SMOKE_ADMIN_KEY=$DJD_ADMIN_KEY_LEGACY" >> "$GITHUB_ENV"
+          else
+            echo "::warning::DJD_ADMIN_KEY/ADMIN_KEY secret not set; post-deploy smoke will skip admin runtime verification."
+          fi
       - name: Post-deploy smoke check
         run: node scripts/post-deploy-smoke.mjs
         env:
           DJD_HEALTHCHECK_URL: https://djdagentscore.dev/health
           DJD_EXPECT_RUNTIME_MODE: combined
           DJD_EXPECT_RELEASE_SHA: ${{ github.sha }}
-          DJD_ADMIN_KEY: ${{ secrets.DJD_ADMIN_KEY != '' && secrets.DJD_ADMIN_KEY || secrets.ADMIN_KEY }}
+          DJD_ADMIN_KEY: ${{ env.DJD_SMOKE_ADMIN_KEY }}
diff --git a/.github/workflows/fly-preview.yml b/.github/workflows/fly-preview.yml
index 03f44bd..c995242 100644
--- a/.github/workflows/fly-preview.yml
+++ b/.github/workflows/fly-preview.yml
@@ -122,13 +122,25 @@ jobs:
             --build-arg DJD_BUILD_TIMESTAMP="${DJD_BUILD_TIMESTAMP}"
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_PREVIEW_API_TOKEN != '' && secrets.FLY_PREVIEW_API_TOKEN || secrets.FLY_API_TOKEN }}
-      - name: Warn when preview admin smoke verification is disabled
-        if: ${{ secrets.FLY_PREVIEW_ADMIN_KEY == '' && secrets.DJD_ADMIN_KEY == '' && secrets.ADMIN_KEY == '' }}
-        run: echo "::warning::FLY_PREVIEW_ADMIN_KEY/DJD_ADMIN_KEY/ADMIN_KEY secret not set; preview smoke will skip admin runtime verification."
+      - name: Resolve preview admin smoke key
+        env:
+          FLY_PREVIEW_ADMIN_KEY_SECRET: ${{ secrets.FLY_PREVIEW_ADMIN_KEY }}
+          DJD_ADMIN_KEY_PRIMARY: ${{ secrets.DJD_ADMIN_KEY }}
+          DJD_ADMIN_KEY_LEGACY: ${{ secrets.ADMIN_KEY }}
+        run: |
+          if [ -n "$FLY_PREVIEW_ADMIN_KEY_SECRET" ]; then
+            echo "DJD_SMOKE_ADMIN_KEY=$FLY_PREVIEW_ADMIN_KEY_SECRET" >> "$GITHUB_ENV"
+          elif [ -n "$DJD_ADMIN_KEY_PRIMARY" ]; then
+            echo "DJD_SMOKE_ADMIN_KEY=$DJD_ADMIN_KEY_PRIMARY" >> "$GITHUB_ENV"
+          elif [ -n "$DJD_ADMIN_KEY_LEGACY" ]; then
+            echo "DJD_SMOKE_ADMIN_KEY=$DJD_ADMIN_KEY_LEGACY" >> "$GITHUB_ENV"
+          else
+            echo "::warning::FLY_PREVIEW_ADMIN_KEY/DJD_ADMIN_KEY/ADMIN_KEY secret not set; preview smoke will skip admin runtime verification."
+          fi
       - name: Post-deploy smoke check
         run: node scripts/post-deploy-smoke.mjs
         env:
           DJD_HEALTHCHECK_URL: ${{ env.DJD_HEALTHCHECK_URL }}
           DJD_EXPECT_RUNTIME_MODE: combined
           DJD_EXPECT_RELEASE_SHA: ${{ github.sha }}
-          DJD_ADMIN_KEY: ${{ secrets.FLY_PREVIEW_ADMIN_KEY != '' && secrets.FLY_PREVIEW_ADMIN_KEY || (secrets.DJD_ADMIN_KEY != '' && secrets.DJD_ADMIN_KEY || secrets.ADMIN_KEY) }}
+          DJD_ADMIN_KEY: ${{ env.DJD_SMOKE_ADMIN_KEY }}