climaybe 3.2.0 → 3.4.0

package/src/workflows/preview/pr-close.yml

@@ -8,6 +8,10 @@ on:
     types: [closed]
     branches: [main, staging, develop, 'staging-*', 'live-*']
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   extract-pr-number:
     uses: ./.github/workflows/reusable-extract-pr-number.yml
@@ -15,73 +19,123 @@ jobs:
   resolve-store:
     runs-on: ubuntu-latest
     outputs:
-      store_alias: ${{ steps.resolve.outputs.alias }}
-      store_alias_secret: ${{ steps.resolve.outputs.alias_secret }}
+      store_alias: ${{ steps.resolve.outputs.store_alias }}
+      store_alias_secret: ${{ steps.resolve.outputs.store_alias_secret }}
+      preview_targets_json: ${{ steps.resolve.outputs.preview_targets_json }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Resolve store alias from base branch
+      - name: Resolve preview store targets from base branch
         id: resolve
         env:
           BASE_REF: ${{ github.event.pull_request.base.ref }}
         run: |
-          if [[ -n "$BASE_REF" && ("$BASE_REF" == staging-* || "$BASE_REF" == live-*) ]]; then
-            ALIAS="${BASE_REF#staging-}"
-            ALIAS="${ALIAS#live-}"
-          else
-            ALIAS=$(node -e "
-              const fs = require('fs');
-              const cfg = JSON.parse(fs.readFileSync('./climaybe.config.json', 'utf8'));
-              const stores = cfg?.stores || {};
-              const defaultStoreRaw = cfg?.default_store;
-              const normalize = (v) => String(v || '')
-                .toLowerCase()
-                .replace(/^https?:\\/\\//, '')
-                .replace(/\\/.*$/, '');
-              const defaultStore = normalize(defaultStoreRaw);
-              let alias = '';
-              if (defaultStore) {
-                for (const [k, d] of Object.entries(stores)) {
-                  if (normalize(d) === defaultStore) {
-                    alias = k;
-                    break;
-                  }
+          node <<'NODE' >>"$GITHUB_OUTPUT"
+          const fs = require('fs');
+          const cfg = JSON.parse(fs.readFileSync('climaybe.config.json', 'utf8'));
+          const stores = cfg?.stores || {};
+          const keys = Object.keys(stores);
+          const baseRef = process.env.BASE_REF || '';
+          const isMulti = keys.length > 1;
+          const isStagingLive =
+            baseRef && (/^staging-/.test(baseRef) || /^live-/.test(baseRef));
+
+          const aliasToSecret = (a) => String(a).toUpperCase().replace(/-/g, '_');
+          const normalizeDomain = (v) =>
+            String(v || '')
+              .toLowerCase()
+              .replace(/^https?:\/\//, '')
+              .replace(/\/.*$/, '');
+
+          let targets = [];
+          if (isMulti && !isStagingLive) {
+            targets = keys.map((alias) => ({ alias, alias_secret: aliasToSecret(alias) }));
+          } else if (isStagingLive) {
+            let a = baseRef.replace(/^staging-/, '').replace(/^live-/, '');
+            targets = [{ alias: a, alias_secret: aliasToSecret(a) }];
+          } else {
+            const defaultStoreNorm = normalizeDomain(cfg?.default_store);
+            let alias = '';
+            if (defaultStoreNorm) {
+              for (const [k, d] of Object.entries(stores)) {
+                if (normalizeDomain(d) === defaultStoreNorm) {
+                  alias = k;
+                  break;
                 }
               }
-              if (!alias) {
-                alias = Object.keys(stores)[0] || '';
-              }
-              if (!alias && defaultStore) {
-                const subdomain = defaultStore.split('.')[0] || 'default';
-                alias = subdomain.replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-') || 'default';
-              }
-              if (!alias) {
-                alias = 'default';
-              }
-              process.stdout.write(alias);
-            ")
-          fi
+            }
+            if (!alias) alias = keys[0] || '';
+            if (!alias && cfg?.default_store) {
+              const sub = normalizeDomain(cfg.default_store).split('.')[0] || 'default';
+              alias = sub.replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-') || 'default';
+            }
+            if (!alias) alias = 'default';
+            targets = [{ alias, alias_secret: aliasToSecret(alias) }];
+          }
 
-          if [ -z "$ALIAS" ]; then
-            echo "Could not resolve store alias from climaybe.config.json config or base branch."
-            exit 1
-          fi
+          if (targets.length === 0 || targets.some((t) => !t.alias)) {
+            console.error('Could not resolve store targets from climaybe.config.json');
+            process.exit(1);
+          }
 
-          ALIAS_SECRET=$(echo "$ALIAS" | tr '[:lower:]-' '[:upper:]_')
-          echo "alias=$ALIAS" >> $GITHUB_OUTPUT
-          echo "alias_secret=$ALIAS_SECRET" >> $GITHUB_OUTPUT
+          console.log('preview_targets_json<<PT_JSON');
+          console.log(JSON.stringify(targets));
+          console.log('PT_JSON');
+          console.log(`store_alias=${targets[0].alias}`);
+          console.log(`store_alias_secret=${targets[0].alias_secret}`);
+          NODE
 
   cleanup-theme:
     needs: [extract-pr-number, resolve-store]
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.resolve-store.outputs.preview_targets_json) }}
     uses: ./.github/workflows/reusable-cleanup-themes.yml
     with:
+      cleanup_mode: by_pr
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
-      store_alias_secret: ${{ needs.resolve-store.outputs.store_alias_secret }}
+      store_alias_secret: ${{ matrix.alias_secret }}
+      result_artifact_prefix: pr-close-cleanup
     secrets: inherit
 
+  cleanup-totals:
+    needs: [cleanup-theme]
+    if: always()
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+    outputs:
+      deleted_count: ${{ steps.sum.outputs.deleted_count }}
+    steps:
+      - name: Download cleanup result fragments
+        continue-on-error: true
+        uses: actions/download-artifact@v4
+        with:
+          pattern: pr-close-cleanup-*
+          merge-multiple: true
+          path: cleanup-counts
+
+      - name: Sum deleted themes across stores
+        id: sum
+        run: |
+          total=0
+          if [ -d cleanup-counts ]; then
+            while IFS= read -r -d '' f; do
+              [ -z "$f" ] && continue
+              [ ! -f "$f" ] && continue
+              n="$(tr -d ' \n\r' < "$f" 2>/dev/null || echo 0)"
+              n="${n:-0}"
+              total=$((total + n))
+            done < <(find cleanup-counts -name 'deleted-count.txt' -type f -print0 2>/dev/null || true)
+          fi
+          echo "deleted_count=$total" >> "$GITHUB_OUTPUT"
+          echo "Total deleted across stores: $total"
+
   comment-on-pr:
-    needs: [cleanup-theme, resolve-store]
+    needs: [cleanup-totals, resolve-store]
+    if: always()
     runs-on: ubuntu-latest
     steps:
       - name: Comment on PR about cleanup
@@ -90,8 +144,7 @@ jobs:
           script: |
             const prNumber = context.payload.pull_request.number;
             const storeAlias = '${{ needs.resolve-store.outputs.store_alias }}' || '';
-            const deletedCount = parseInt('${{ needs.cleanup-theme.outputs.deleted_count }}') || 0;
-            const deletedThemesRaw = `${{ needs.cleanup-theme.outputs.deleted_themes }}`.trim();
+            const deletedCount = parseInt('${{ needs.cleanup-totals.outputs.deleted_count }}') || 0;
 
             const lines = [
               '## 🧹 Theme Cleanup Complete',
@@ -100,22 +153,10 @@ jobs:
               '',
               `**Branch:** ${context.payload.pull_request.head.ref}`,
               `**PR Status:** ${context.payload.pull_request.state}`,
-              storeAlias ? `**Store:** ${storeAlias}` : null,
-              `**Deleted Themes:** ${deletedCount}`
+              storeAlias ? `**Primary store (config):** ${storeAlias}` : null,
+              `**Deleted themes (all preview stores):** ${deletedCount}`
             ].filter(Boolean);
 
-            if (deletedCount > 0 && deletedThemesRaw) {
-              const deletedThemeLines = deletedThemesRaw
-                .split('\n')
-                .map(name => name.trim())
-                .filter(Boolean)
-                .map(name => `- ${name}`);
-
-              if (deletedThemeLines.length > 0) {
-                lines.push('', '### Deleted Theme Names', ...deletedThemeLines);
-              }
-            }
-
             lines.push('', '---', '*Theme cleanup runs automatically when a PR is closed.*');
 
             await github.rest.issues.createComment({

package/src/workflows/preview/pr-update.yml

@@ -44,119 +44,130 @@ jobs:
     if: needs.filter.outputs.theme == 'true'
     runs-on: ubuntu-latest
     outputs:
-      store_alias: ${{ steps.resolve.outputs.alias }}
-      store_alias_secret: ${{ steps.resolve.outputs.alias_secret }}
+      store_alias: ${{ steps.resolve.outputs.store_alias }}
+      store_alias_secret: ${{ steps.resolve.outputs.store_alias_secret }}
+      preview_targets_json: ${{ steps.resolve.outputs.preview_targets_json }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Resolve store alias from base branch
+      - name: Resolve preview store targets from base branch
         id: resolve
         env:
           BASE_REF: ${{ github.event.pull_request.base.ref }}
         run: |
-          # On staging-<alias> or live-<alias> PRs, use that store; otherwise default store
-          if [[ -n "$BASE_REF" && ("$BASE_REF" == staging-* || "$BASE_REF" == live-*) ]]; then
-            ALIAS="${BASE_REF#staging-}"
-            ALIAS="${ALIAS#live-}"
-          else
-            ALIAS=$(node -e "
-              const fs = require('fs');
-              const cfg = JSON.parse(fs.readFileSync('./climaybe.config.json', 'utf8'));
-              const stores = cfg?.stores || {};
-              const defaultStoreRaw = cfg?.default_store;
-              const normalize = (v) => String(v || '')
-                .toLowerCase()
-                .replace(/^https?:\\/\\//, '')
-                .replace(/\\/.*$/, '');
-              const defaultStore = normalize(defaultStoreRaw);
-              let alias = '';
-              if (defaultStore) {
-                for (const [k, d] of Object.entries(stores)) {
-                  if (normalize(d) === defaultStore) {
-                    alias = k;
-                    break;
-                  }
+          node <<'NODE' >>"$GITHUB_OUTPUT"
+          const fs = require('fs');
+          const cfg = JSON.parse(fs.readFileSync('climaybe.config.json', 'utf8'));
+          const stores = cfg?.stores || {};
+          const keys = Object.keys(stores);
+          const baseRef = process.env.BASE_REF || '';
+          const isMulti = keys.length > 1;
+          const isStagingLive =
+            baseRef && (/^staging-/.test(baseRef) || /^live-/.test(baseRef));
+
+          const aliasToSecret = (a) => String(a).toUpperCase().replace(/-/g, '_');
+          const normalizeDomain = (v) =>
+            String(v || '')
+              .toLowerCase()
+              .replace(/^https?:\/\//, '')
+              .replace(/\/.*$/, '');
+
+          let targets = [];
+          if (isMulti && !isStagingLive) {
+            targets = keys.map((alias) => ({ alias, alias_secret: aliasToSecret(alias) }));
+          } else if (isStagingLive) {
+            let a = baseRef.replace(/^staging-/, '').replace(/^live-/, '');
+            targets = [{ alias: a, alias_secret: aliasToSecret(a) }];
+          } else {
+            const defaultStoreNorm = normalizeDomain(cfg?.default_store);
+            let alias = '';
+            if (defaultStoreNorm) {
+              for (const [k, d] of Object.entries(stores)) {
+                if (normalizeDomain(d) === defaultStoreNorm) {
+                  alias = k;
+                  break;
                 }
               }
-              if (!alias) {
-                alias = Object.keys(stores)[0] || '';
-              }
-              if (!alias && defaultStore) {
-                const subdomain = defaultStore.split('.')[0] || 'default';
-                alias = subdomain.replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-') || 'default';
-              }
-              if (!alias) {
-                alias = 'default';
-              }
-              process.stdout.write(alias);
-            ")
-          fi
+            }
+            if (!alias) alias = keys[0] || '';
+            if (!alias && cfg?.default_store) {
+              const sub = normalizeDomain(cfg.default_store).split('.')[0] || 'default';
+              alias = sub.replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-') || 'default';
+            }
+            if (!alias) alias = 'default';
+            targets = [{ alias, alias_secret: aliasToSecret(alias) }];
+          }
 
-          if [ -z "$ALIAS" ]; then
-            echo "Could not resolve default store alias from climaybe.config.json config."
-            exit 1
-          fi
+          if (targets.length === 0 || targets.some((t) => !t.alias)) {
+            console.error('Could not resolve store targets from climaybe.config.json');
+            process.exit(1);
+          }
 
-          ALIAS_SECRET=$(echo "$ALIAS" | tr '[:lower:]-' '[:upper:]_')
-          echo "alias=$ALIAS" >> $GITHUB_OUTPUT
-          echo "alias_secret=$ALIAS_SECRET" >> $GITHUB_OUTPUT
+          console.log('preview_targets_json<<PT_JSON');
+          console.log(JSON.stringify(targets));
+          console.log('PT_JSON');
+          console.log(`store_alias=${targets[0].alias}`);
+          console.log(`store_alias_secret=${targets[0].alias_secret}`);
+          NODE
 
-      - name: Validate Shopify credentials
+  validate-secrets-per-store:
+    needs: [validate-environment]
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.validate-environment.outputs.preview_targets_json) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Require Shopify URL + theme token for this store
         env:
-          SHOPIFY_STORE_URL_SCOPED: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', steps.resolve.outputs.alias_secret)] }}
-          SHOPIFY_THEME_ACCESS_TOKEN_SCOPED: ${{ secrets[format('SHOPIFY_THEME_ACCESS_TOKEN_{0}', steps.resolve.outputs.alias_secret)] }}
+          SHOPIFY_STORE_URL_SCOPED: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', matrix.alias_secret)] }}
+          SHOPIFY_THEME_ACCESS_TOKEN_SCOPED: ${{ secrets[format('SHOPIFY_THEME_ACCESS_TOKEN_{0}', matrix.alias_secret)] }}
           SHOPIFY_STORE_URL_DEFAULT: ${{ secrets.SHOPIFY_STORE_URL }}
           SHOPIFY_THEME_ACCESS_TOKEN_DEFAULT: ${{ secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
         run: |
           SHOPIFY_STORE_URL="${SHOPIFY_STORE_URL_SCOPED:-$SHOPIFY_STORE_URL_DEFAULT}"
           SHOPIFY_THEME_ACCESS_TOKEN="${SHOPIFY_THEME_ACCESS_TOKEN_SCOPED:-$SHOPIFY_THEME_ACCESS_TOKEN_DEFAULT}"
-
-          if [ -z "$SHOPIFY_STORE_URL" ]; then
-            echo "No store URL secret found. Expected SHOPIFY_STORE_URL_${{ steps.resolve.outputs.alias_secret }} or SHOPIFY_STORE_URL."
+          if [ -z "$SHOPIFY_STORE_URL" ] || [ -z "$SHOPIFY_THEME_ACCESS_TOKEN" ]; then
+            echo "Missing SHOPIFY_* for ${{ matrix.alias }} (secret suffix ${{ matrix.alias_secret }})."
             exit 1
           fi
-          if [ -z "$SHOPIFY_THEME_ACCESS_TOKEN" ]; then
-            echo "No theme token secret found. Expected SHOPIFY_THEME_ACCESS_TOKEN_${{ steps.resolve.outputs.alias_secret }} or SHOPIFY_THEME_ACCESS_TOKEN."
-            exit 1
-          fi
-          echo "Shopify credentials are configured for alias: ${{ steps.resolve.outputs.alias }}"
+          echo "Shopify credentials OK for ${{ matrix.alias }}"
 
   cleanup-themes:
-    needs: [extract-pr-number, validate-environment]
+    needs: [extract-pr-number, validate-secrets-per-store]
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.validate-environment.outputs.preview_targets_json) }}
     uses: ./.github/workflows/reusable-cleanup-themes.yml
     with:
+      cleanup_mode: by_pr
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
-      store_alias_secret: ${{ needs.validate-environment.outputs.store_alias_secret }}
+      store_alias_secret: ${{ matrix.alias_secret }}
     secrets: inherit
 
-  share-theme:
+  publish-preview-store:
     needs: [validate-environment, extract-pr-number, cleanup-themes]
-    uses: ./.github/workflows/reusable-share-theme.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.validate-environment.outputs.preview_targets_json) }}
+    uses: ./.github/workflows/reusable-publish-pr-preview-store.yml
     with:
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
-      store_alias: ${{ needs.validate-environment.outputs.store_alias }}
-      store_alias_secret: ${{ needs.validate-environment.outputs.store_alias_secret }}
-    secrets: inherit
-
-  rename-theme:
-    needs: [share-theme, extract-pr-number, validate-environment]
-    uses: ./.github/workflows/reusable-rename-theme.yml
-    with:
-      theme_id: ${{ needs.share-theme.outputs.theme_id }}
-      theme_name: ${{ needs.share-theme.outputs.theme_name }}
-      pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
-      store_alias: ${{ needs.validate-environment.outputs.store_alias }}
-      store_alias_secret: ${{ needs.validate-environment.outputs.store_alias_secret }}
+      store_alias: ${{ matrix.alias }}
+      store_alias_secret: ${{ matrix.alias_secret }}
     secrets: inherit
 
   comment-on-pr:
-    needs: [share-theme, rename-theme, extract-pr-number, validate-environment]
+    needs: [publish-preview-store, extract-pr-number, validate-environment]
     uses: ./.github/workflows/reusable-comment-on-pr.yml
     with:
-      theme_id: ${{ needs.share-theme.outputs.theme_id }}
-      share_output: ${{ needs.share-theme.outputs.share_output }}
+      theme_id: ${{ needs.publish-preview-store.outputs.theme_id }}
+      share_output: ${{ needs.publish-preview-store.outputs.share_output }}
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number_unpadded }}
       store_alias: ${{ needs.validate-environment.outputs.store_alias }}
       store_alias_secret: ${{ needs.validate-environment.outputs.store_alias_secret }}
+      use_preview_fragments: 'true'
     secrets: inherit

package/src/workflows/preview/reusable-cleanup-themes.yml

@@ -3,14 +3,25 @@ name: Cleanup Themes
 on:
   workflow_call:
     inputs:
+      cleanup_mode:
+        required: false
+        type: string
+        default: 'by_pr'
+        description: "by_pr: delete themes whose name ends with -PR{pr_number} (padded). orphan_pr: delete themes ending with -PR<n> when PR n is not open in this repo."
       pr_number:
-        required: true
+        required: false
         type: string
-        description: "PR number to clean up themes for"
+        default: ''
+        description: "Padded PR number (e.g. 09) when cleanup_mode is by_pr; ignored for orphan_pr."
       store_alias_secret:
         required: false
         type: string
         description: "Upper snake-case alias for scoped secret (e.g. VOLDT_STAGING). If set, uses SHOPIFY_*_<this>; else uses SHOPIFY_STORE_URL / SHOPIFY_THEME_ACCESS_TOKEN."
+      result_artifact_prefix:
+        required: false
+        type: string
+        default: ''
+        description: "When non-empty, uploads a tiny artifact named {prefix}-{store_alias_secret} with deleted_count for matrix fan-in."
     outputs:
       deleted_count:
         description: "Number of deleted themes"
@@ -34,6 +45,10 @@ on:
 jobs:
   cleanup:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      actions: write
     outputs:
       deleted_count: ${{ steps.cleanup.outputs.deleted_count }}
       deleted_themes: ${{ steps.cleanup.outputs.deleted_themes }}
@@ -51,7 +66,10 @@ jobs:
           SHOPIFY_STORE_URL: ${{ inputs.store_alias_secret && secrets[format('SHOPIFY_STORE_URL_{0}', inputs.store_alias_secret)] || secrets.SHOPIFY_STORE_URL }}
           SHOPIFY_THEME_ACCESS_TOKEN: ${{ inputs.store_alias_secret && secrets[format('SHOPIFY_THEME_ACCESS_TOKEN_{0}', inputs.store_alias_secret)] || secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
           PR_NUMBER: ${{ inputs.pr_number }}
+          CLEANUP_MODE: ${{ inputs.cleanup_mode }}
           STORE_ALIAS_SECRET: ${{ inputs.store_alias_secret }}
+          RESULT_ARTIFACT_PREFIX: ${{ inputs.result_artifact_prefix }}
+          GH_TOKEN: ${{ github.token }}
         run: |
           set -euo pipefail
 
@@ -62,11 +80,13 @@ jobs:
           {
             echo "### 🧹 Cleanup preview themes"
             echo ""
-            echo "- **PR**: \`${PR_NUMBER}\`"
+            echo "- **Mode**: \`${CLEANUP_MODE}\`"
+            echo "- **PR (by_pr mode)**: \`${PR_NUMBER:-<n/a>}\`"
             echo "- **Store alias secret**: \`${STORE_ALIAS_SECRET:-<default>}\`"
             echo "- **Store (host)**: \`${STORE_HOST:-<missing>}\`"
           } >> "$GITHUB_STEP_SUMMARY"
 
+          echo "CLEANUP_MODE=${CLEANUP_MODE}"
           echo "PR=${PR_NUMBER}"
           echo "Store alias secret=${STORE_ALIAS_SECRET:-<default>}"
           echo "Store host=${STORE_HOST:-<missing>}"
@@ -93,6 +113,11 @@ jobs:
             exit 0
           fi
 
+          if [ "$CLEANUP_MODE" = "by_pr" ] && [ -z "${PR_NUMBER:-}" ]; then
+            echo "cleanup_mode is by_pr but pr_number is empty."
+            exit 1
+          fi
+
           echo "store_hint=${STORE_HOST:-}" >> "$GITHUB_OUTPUT"
           echo "skipped_reason=" >> "$GITHUB_OUTPUT"
 
@@ -121,7 +146,6 @@ jobs:
             exit 1
           fi
 
-          # Defensive: if CLI returned empty, treat as an empty list (instead of jq failure).
           if [ ! -s "$THEME_LIST_JSON" ]; then
             echo "[]" > "$THEME_LIST_JSON"
           fi
@@ -134,11 +158,59 @@ jobs:
           DELETED_COUNT=0
           DELETED_THEMES=""
 
+          OPEN_PRS_FILE="$(mktemp)"
+          if [ "$CLEANUP_MODE" = "orphan_pr" ]; then
+            echo "Fetching open PR numbers (limit 1000)…"
+            if ! gh pr list --repo "${GITHUB_REPOSITORY}" --state open --limit 1000 --json number -q '.[].number' > "$OPEN_PRS_FILE" 2>/dev/null; then
+              echo "gh pr list failed; cannot determine open PRs safely. Skipping orphan cleanup."
+              {
+                echo ""
+                echo "#### Result"
+                echo "- **Skipped**: \`gh pr list\` failed (check \`pull-requests: read\` permission)"
+              } >> "$GITHUB_STEP_SUMMARY"
+              echo "skipped_reason=gh_pr_list_failed" >> "$GITHUB_OUTPUT"
+              echo "matched_count=0" >> "$GITHUB_OUTPUT"
+              echo "matched_themes<<MATCHED_EOF" >> "$GITHUB_OUTPUT"
+              echo "MATCHED_EOF" >> "$GITHUB_OUTPUT"
+              echo "deleted_count=0" >> "$GITHUB_OUTPUT"
+              echo "deleted_themes<<DELETED_EOF" >> "$GITHUB_OUTPUT"
+              echo "DELETED_EOF" >> "$GITHUB_OUTPUT"
+              rm -f "$THEME_LIST_ERR" "$THEME_LIST_JSON" "$OPEN_PRS_FILE"
+              exit 0
+            fi
+            echo "Open PR count (lines): $(wc -l < "$OPEN_PRS_FILE" | tr -d ' ')"
+          fi
+
+          should_delete_theme() {
+            local id="$1"
+            local name="$2"
+            local suffix=""
+            suffix="$(printf '%s' "$name" | sed -n 's/.*-PR\([0-9][0-9]*\)$/\1/p')"
+            if [ -z "$suffix" ]; then
+              return 1
+            fi
+            if [ "$CLEANUP_MODE" = "by_pr" ]; then
+              case "$name" in
+                *"-PR${PR_NUMBER}") return 0 ;;
+                *) return 1 ;;
+              esac
+            fi
+            if [ "$CLEANUP_MODE" = "orphan_pr" ]; then
+              local num=""
+              num=$((10#$suffix))
+              if grep -qx "$num" "$OPEN_PRS_FILE" 2>/dev/null; then
+                return 1
+              fi
+              return 0
+            fi
+            return 1
+          }
+
           while IFS=$'\t' read -r THEME_ID THEME_NAME; do
             [ -z "$THEME_ID" ] && continue
             [ -z "$THEME_NAME" ] && continue
 
-            if printf "%s" "$THEME_NAME" | grep -q "PR${PR_NUMBER}"; then
+            if should_delete_theme "$THEME_ID" "$THEME_NAME"; then
               MATCHED_COUNT=$((MATCHED_COUNT + 1))
               MATCHED_THEMES="${MATCHED_THEMES}${THEME_NAME}\n"
               echo "Matched: $THEME_NAME ($THEME_ID)"
@@ -164,7 +236,7 @@ jobs:
             echo ""
             echo "#### Result"
             echo "- **Total themes on store**: ${ALL_COUNT}"
-            echo "- **Matched (PR${PR_NUMBER})**: ${MATCHED_COUNT}"
+            echo "- **Matched**: ${MATCHED_COUNT}"
             echo "- **Deleted**: ${DELETED_COUNT}"
           } >> "$GITHUB_STEP_SUMMARY"
 
@@ -197,3 +269,16 @@ jobs:
             printf "%b" "$DELETED_THEMES"
             echo "DELETED_EOF"
           } >> "$GITHUB_OUTPUT"
+
+          rm -f "$THEME_LIST_ERR" "$THEME_LIST_JSON" "$OPEN_PRS_FILE"
+
+      - name: Upload deleted count for matrix fan-in
+        if: inputs.result_artifact_prefix != ''
+        run: printf '%s' '${{ steps.cleanup.outputs.deleted_count }}' > deleted-count.txt
+      - name: Save cleanup result artifact
+        if: inputs.result_artifact_prefix != ''
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.result_artifact_prefix }}-${{ inputs.store_alias_secret }}
+          path: deleted-count.txt
+          retention-days: 2