climaybe 1.0.0 → 1.1.0

package/src/workflows/multi/multistore-hotfix-to-main.yml

@@ -0,0 +1,84 @@
+# climaybe — Multistore Hotfix to Main
+# Automatically syncs direct hotfixes from staging-<store> or live-<store> back to main.
+# Triggers: push to staging-* or live-*; also after Root to Stores completes (live-*).
+# Merges the store branch into main with [hotfix-backport] so post-merge-tag runs patch bump.
+# main-to-staging-stores skips [hotfix-backport] commits so hotfixes are not re-pushed to stores.
+
+name: Multistore Hotfix to Main
+
+on:
+  push:
+    branches:
+      - 'staging-*'
+      - 'live-*'
+  workflow_run:
+    workflows: ["Root to Stores"]
+    types: [completed]
+    branches:
+      - 'live-*'
+
+concurrency:
+  group: multistore-hotfix-to-main-${{ github.event_name == 'push' && github.ref_name || github.event.workflow_run.head_branch }}
+  cancel-in-progress: false
+
+jobs:
+  sync-to-main:
+    if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Resolve source branch ref
+        id: ref
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_run" ]; then
+            echo "branch=${{ github.event.workflow_run.head_branch }}" >> $GITHUB_OUTPUT
+          else
+            echo "branch=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+          fi
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check if backport is needed
+        id: check
+        run: |
+          SOURCE="${{ steps.ref.outputs.branch }}"
+
+          MERGE_BASE=$(git merge-base origin/main origin/$SOURCE 2>/dev/null || echo "")
+
+          if [ -z "$MERGE_BASE" ]; then
+            echo "needs_backport=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          COMMITS=$(git log --oneline ${MERGE_BASE}..origin/$SOURCE -- . ':!stores/' 2>/dev/null | \
+            grep -v "\[stores-to-root\]" | grep -v "\[root-to-stores\]" | grep -v "chore(release)" || true)
+
+          if [ -n "$COMMITS" ]; then
+            echo "needs_backport=true" >> $GITHUB_OUTPUT
+            echo "Commits to sync to main:"
+            echo "$COMMITS"
+          else
+            echo "needs_backport=false" >> $GITHUB_OUTPUT
+            echo "No new commits to sync."
+          fi
+
+      - name: Merge into main and push
+        if: steps.check.outputs.needs_backport == 'true'
+        run: |
+          SOURCE="${{ steps.ref.outputs.branch }}"
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git fetch origin
+          git checkout main
+          git merge origin/$SOURCE --no-ff -m "Merge $SOURCE into main [hotfix-backport]"
+          git push origin main
+
+          echo "Synced $SOURCE → main"

package/src/workflows/multi/pr-to-live.yml

@@ -10,34 +10,78 @@ on:
     types: [completed]
     branches:
       - 'staging-*'
+  workflow_dispatch:
 
 jobs:
   create-pr:
-    # Only run if the triggering workflow succeeded
-    if: github.event.workflow_run.conclusion == 'success'
+    # Run on successful Stores to Root completion, or explicit dispatch.
+    if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: write
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      SHOPIFY_CLI_THEME_TOKEN: ${{ secrets.SHOPIFY_CLI_THEME_TOKEN }}
     steps:
       - uses: actions/checkout@v4
 
       - name: Extract store alias
         id: alias
         run: |
-          BRANCH="${{ github.event.workflow_run.head_branch }}"
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            BRANCH="${{ github.ref_name }}"
+          else
+            BRANCH="${{ github.event.workflow_run.head_branch }}"
+          fi
+
+          if [[ "$BRANCH" != staging-* ]]; then
+            echo "Branch $BRANCH is not a staging-* branch, skipping."
+            exit 0
+          fi
+
           ALIAS="${BRANCH#staging-}"
+          ALIAS_SECRET=$(echo "$ALIAS" | tr '[:lower:]-' '[:upper:]_')
           echo "alias=$ALIAS" >> $GITHUB_OUTPUT
+          echo "alias_secret=$ALIAS_SECRET" >> $GITHUB_OUTPUT
           echo "staging_branch=$BRANCH" >> $GITHUB_OUTPUT
           echo "live_branch=live-${ALIAS}" >> $GITHUB_OUTPUT
 
+      - name: Resolve store domain from package.json
+        id: store
+        env:
+          SHOPIFY_STORE_URL_SCOPED: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', steps.alias.outputs.alias_secret)] }}
+          SHOPIFY_STORE_URL_DEFAULT: ${{ secrets.SHOPIFY_STORE_URL }}
+        run: |
+          ALIAS="${{ steps.alias.outputs.alias }}"
+          DOMAIN_CONFIG=$(node -e "
+            const fs = require('fs');
+            const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+            const domain = pkg?.config?.stores?.['${ALIAS}'] || '';
+            process.stdout.write(domain);
+          ")
+          DOMAIN="${SHOPIFY_STORE_URL_SCOPED:-}"
+          if [ -z "$DOMAIN" ]; then
+            DOMAIN="${SHOPIFY_STORE_URL_DEFAULT:-}"
+          fi
+          if [ -z "$DOMAIN" ]; then
+            DOMAIN="$DOMAIN_CONFIG"
+          fi
+          DOMAIN=$(echo "$DOMAIN" | sed -E 's#^https?://##; s#/.*$##')
+          echo "domain=$DOMAIN" >> $GITHUB_OUTPUT
+
       - name: Create PR to live branch
+        env:
+          SHOPIFY_CLI_THEME_TOKEN_SCOPED: ${{ secrets[format('SHOPIFY_CLI_THEME_TOKEN_{0}', steps.alias.outputs.alias_secret)] }}
+          SHOPIFY_CLI_THEME_TOKEN_DEFAULT: ${{ secrets.SHOPIFY_CLI_THEME_TOKEN }}
         run: |
           STAGING="${{ steps.alias.outputs.staging_branch }}"
           LIVE="${{ steps.alias.outputs.live_branch }}"
           ALIAS="${{ steps.alias.outputs.alias }}"
+          DOMAIN="${{ steps.store.outputs.domain }}"
+          STAGING_THEME_ID=""
+          REPO_NAME="${GITHUB_REPOSITORY#*/}"
+          SHOPIFY_TOKEN="${SHOPIFY_CLI_THEME_TOKEN_SCOPED:-$SHOPIFY_CLI_THEME_TOKEN_DEFAULT}"
 
           # Check if live branch exists
           if ! git ls-remote --heads origin "$LIVE" | grep -q "$LIVE"; then
@@ -54,15 +98,45 @@ jobs:
           fi
 
           # Create PR
+          BODY=$(printf "Deployment PR for **%s** store.\n\nReview the changes and merge to deploy." "$ALIAS")
+
+          if [ -n "$DOMAIN" ]; then
+            # Try to resolve a staging/non-live theme ID for this store.
+            if [ -n "$SHOPIFY_TOKEN" ]; then
+              if ! command -v shopify >/dev/null 2>&1; then
+                npm install -g @shopify/cli @shopify/theme >/dev/null 2>&1 || true
+              fi
+
+              THEME_JSON=$(shopify theme list \
+                --store "$DOMAIN" \
+                --password "$SHOPIFY_TOKEN" \
+                --json 2>/dev/null || echo "[]")
+
+              STAGING_THEME_ID=$(echo "$THEME_JSON" | jq -r '
+                # Prefer exact branch theme naming: "<repo>/<staging-branch>"
+                (map(select(.role != "main" and .name == ($repo + "/" + $branch)))[0].id)
+                # Fallback: branch suffix match (still branch-specific)
+                // (map(select(.role != "main" and (.name | endswith("/" + $branch))))[0].id)
+                // empty
+              ' --arg repo "$REPO_NAME" --arg branch "$STAGING")
+            fi
+
+            if [ -n "$STAGING_THEME_ID" ]; then
+              PREVIEW_URL="https://${DOMAIN}?preview_theme_id=${STAGING_THEME_ID}"
+              CUSTOMIZE_URL="https://${DOMAIN}/admin/themes/${STAGING_THEME_ID}/editor"
+              BODY="${BODY}"$'\n\n'"**Customize URL (Staging Theme):** ${CUSTOMIZE_URL}"$'\n'"**Preview URL (Staging Theme):** ${PREVIEW_URL}"
+            else
+              BODY="${BODY}"$'\n\n'"⚠️ Staging theme link not found for branch \`${STAGING}\`."$'\n'"Expected naming: \`${REPO_NAME}/${STAGING}\` (or suffix match \`/${STAGING}\`)."
+            fi
+          fi
+
+          BODY="${BODY}"$'\n\n'"*Generated by climaybe*"
+
           PR_URL=$(gh pr create \
             --base "$LIVE" \
             --head "$STAGING" \
             --title "Deploy to ${ALIAS}" \
-            --body "Deployment PR for **${ALIAS}** store.
-
-          Review the changes and merge to deploy.
-
-          *Generated by climaybe*" 2>/dev/null || echo "")
+            --body "$BODY" 2>/dev/null || echo "")
 
           if [ -n "$PR_URL" ]; then
             echo "Created PR: $PR_URL"

package/src/workflows/multi/stores-to-root.yml

@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - 'staging-*'
+  workflow_dispatch:
 
 # Prevent concurrent runs per branch
 concurrency:
@@ -27,10 +28,16 @@ jobs:
       - name: Skip if this is a sync commit
         id: gate
         run: |
-          COMMIT_MSG="${{ github.event.head_commit.message }}"
-          if echo "$COMMIT_MSG" | grep -q "\[stores-to-root\]"; then
-            echo "skip=true" >> $GITHUB_OUTPUT
+          if [ "${{ github.event_name }}" = "push" ]; then
+            COMMIT_MSG="${{ github.event.head_commit.message }}"
+            if echo "$COMMIT_MSG" | grep -q "\[stores-to-root\]"; then
+              echo "skip=true" >> $GITHUB_OUTPUT
+            else
+              echo "skip=false" >> $GITHUB_OUTPUT
+            fi
           else
+            # Manual/API dispatch should always run for the selected branch ref.
+            echo "workflow_dispatch detected, bypassing sync-commit gate."
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
 

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

@@ -0,0 +1,63 @@
+# climaybe — PR Close (Optional Preview Package)
+# Cleans preview themes for the PR number and comments cleanup details.
+
+name: PR Close
+
+on:
+  pull_request:
+    types: [closed]
+    branches: [main, staging, develop]
+
+jobs:
+  extract-pr-number:
+    uses: ./.github/workflows/reusable-extract-pr-number.yml
+
+  cleanup-theme:
+    needs: extract-pr-number
+    uses: ./.github/workflows/reusable-cleanup-themes.yml
+    with:
+      pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
+    secrets: inherit
+
+  comment-on-pr:
+    needs: cleanup-theme
+    runs-on: ubuntu-latest
+    steps:
+      - name: Comment on PR about cleanup
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const prNumber = context.payload.pull_request.number;
+            const deletedCount = parseInt('${{ needs.cleanup-theme.outputs.deleted_count }}') || 0;
+            const deletedThemesRaw = `${{ needs.cleanup-theme.outputs.deleted_themes }}`.trim();
+
+            const lines = [
+              '## 🧹 Theme Cleanup Complete',
+              '',
+              'The preview theme cleanup has finished.',
+              '',
+              `**Branch:** ${context.payload.pull_request.head.ref}`,
+              `**PR Status:** ${context.payload.pull_request.state}`,
+              `**Deleted Themes:** ${deletedCount}`
+            ];
+
+            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({
+              issue_number: prNumber,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: lines.join('\n')
+            });

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

@@ -0,0 +1,112 @@
+# climaybe — PR Update (Optional Preview Package)
+# Creates a Shopify preview theme on PR update, renames it with PR number,
+# and posts preview/customize links back to the PR.
+
+name: PR Update
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches: [main, staging, develop]
+
+jobs:
+  extract-pr-number:
+    uses: ./.github/workflows/reusable-extract-pr-number.yml
+
+  validate-environment:
+    runs-on: ubuntu-latest
+    outputs:
+      store_alias: ${{ steps.resolve.outputs.alias }}
+      store_alias_secret: ${{ steps.resolve.outputs.alias_secret }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Resolve default store alias
+        id: resolve
+        run: |
+          ALIAS=$(node -e "
+            const fs = require('fs');
+            const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+            const stores = pkg?.config?.stores || {};
+            const normalize = (v) => String(v || '')
+              .toLowerCase()
+              .replace(/^https?:\\/\\//, '')
+              .replace(/\\/.*$/, '');
+            const defaultStore = normalize(pkg?.config?.default_store);
+            let alias = '';
+            if (defaultStore) {
+              for (const [k, d] of Object.entries(stores)) {
+                if (normalize(d) === defaultStore) {
+                  alias = k;
+                  break;
+                }
+              }
+            }
+            if (!alias) {
+              alias = Object.keys(stores)[0] || '';
+            }
+            process.stdout.write(alias);
+          ")
+
+          if [ -z "$ALIAS" ]; then
+            echo "Could not resolve default store alias from package.json config."
+            exit 1
+          fi
+
+          ALIAS_SECRET=$(echo "$ALIAS" | tr '[:lower:]-' '[:upper:]_')
+          echo "alias=$ALIAS" >> $GITHUB_OUTPUT
+          echo "alias_secret=$ALIAS_SECRET" >> $GITHUB_OUTPUT
+
+      - name: Validate Shopify credentials
+        env:
+          SHOPIFY_STORE_URL_SCOPED: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', steps.resolve.outputs.alias_secret)] }}
+          SHOPIFY_CLI_THEME_TOKEN_SCOPED: ${{ secrets[format('SHOPIFY_CLI_THEME_TOKEN_{0}', steps.resolve.outputs.alias_secret)] }}
+          SHOPIFY_STORE_URL_DEFAULT: ${{ secrets.SHOPIFY_STORE_URL }}
+          SHOPIFY_CLI_THEME_TOKEN_DEFAULT: ${{ secrets.SHOPIFY_CLI_THEME_TOKEN }}
+        run: |
+          SHOPIFY_STORE_URL="${SHOPIFY_STORE_URL_SCOPED:-$SHOPIFY_STORE_URL_DEFAULT}"
+          SHOPIFY_CLI_THEME_TOKEN="${SHOPIFY_CLI_THEME_TOKEN_SCOPED:-$SHOPIFY_CLI_THEME_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."
+            exit 1
+          fi
+          if [ -z "$SHOPIFY_CLI_THEME_TOKEN" ]; then
+            echo "No theme token secret found. Expected SHOPIFY_CLI_THEME_TOKEN_${{ steps.resolve.outputs.alias_secret }} or SHOPIFY_CLI_THEME_TOKEN."
+            exit 1
+          fi
+          echo "Shopify credentials are configured for alias: ${{ steps.resolve.outputs.alias }}"
+
+  share-theme:
+    needs: [validate-environment, extract-pr-number]
+    uses: ./.github/workflows/reusable-share-theme.yml
+    with:
+      pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
+      store_alias: ${{ needs.validate-environment.outputs.store_alias }}
+    secrets:
+      SHOPIFY_STORE_URL: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_STORE_URL }}
+      SHOPIFY_CLI_THEME_TOKEN: ${{ secrets[format('SHOPIFY_CLI_THEME_TOKEN_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_CLI_THEME_TOKEN }}
+
+  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 }}
+    secrets:
+      SHOPIFY_STORE_URL: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_STORE_URL }}
+      SHOPIFY_CLI_THEME_TOKEN: ${{ secrets[format('SHOPIFY_CLI_THEME_TOKEN_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_CLI_THEME_TOKEN }}
+
+  comment-on-pr:
+    needs: [share-theme, rename-theme, 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 }}
+      pr_number: ${{ needs.extract-pr-number.outputs.pr_number_unpadded }}
+      store_alias: ${{ needs.validate-environment.outputs.store_alias }}
+    secrets:
+      SHOPIFY_STORE_URL: ${{ secrets[format('SHOPIFY_STORE_URL_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_STORE_URL }}

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

@@ -0,0 +1,71 @@
+name: Cleanup Themes
+
+on:
+  workflow_call:
+    inputs:
+      pr_number:
+        required: true
+        type: string
+        description: "PR number to clean up themes for"
+    outputs:
+      deleted_count:
+        description: "Number of deleted themes"
+        value: ${{ jobs.cleanup.outputs.deleted_count }}
+      deleted_themes:
+        description: "Deleted theme names, one per line"
+        value: ${{ jobs.cleanup.outputs.deleted_themes }}
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    outputs:
+      deleted_count: ${{ steps.cleanup.outputs.deleted_count }}
+      deleted_themes: ${{ steps.cleanup.outputs.deleted_themes }}
+    steps:
+      - name: Install Shopify CLI
+        run: npm install -g @shopify/cli @shopify/theme
+
+      - name: Cleanup PR preview themes
+        id: cleanup
+        env:
+          SHOPIFY_STORE_URL: ${{ secrets.SHOPIFY_STORE_URL }}
+          SHOPIFY_CLI_THEME_TOKEN: ${{ secrets.SHOPIFY_CLI_THEME_TOKEN }}
+          PR_NUMBER: ${{ inputs.pr_number }}
+        run: |
+          if [ -z "$SHOPIFY_STORE_URL" ] || [ -z "$SHOPIFY_CLI_THEME_TOKEN" ]; then
+            echo "Missing Shopify secrets."
+            exit 1
+          fi
+
+          THEME_LIST=$(shopify theme list \
+            --store "$SHOPIFY_STORE_URL" \
+            --password "$SHOPIFY_CLI_THEME_TOKEN" \
+            --json 2>/dev/null || echo "[]")
+
+          DELETED_COUNT=0
+          DELETED_THEMES=""
+
+          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 shopify theme delete \
+                --store "$SHOPIFY_STORE_URL" \
+                --password "$SHOPIFY_CLI_THEME_TOKEN" \
+                --force \
+                --theme "$THEME_ID" 2>/dev/null; then
+                DELETED_COUNT=$((DELETED_COUNT + 1))
+                DELETED_THEMES="${DELETED_THEMES}${THEME_NAME}\n"
+              else
+                echo "Failed to delete theme: $THEME_NAME ($THEME_ID)"
+              fi
+            fi
+          done < <(echo "$THEME_LIST" | jq -r '.[] | [.id, .name] | @tsv')
+
+          echo "deleted_count=$DELETED_COUNT" >> $GITHUB_OUTPUT
+          {
+            echo "deleted_themes<<DELETED_EOF"
+            printf "%b" "$DELETED_THEMES"
+            echo "DELETED_EOF"
+          } >> $GITHUB_OUTPUT

package/src/workflows/preview/reusable-comment-on-pr.yml

@@ -0,0 +1,76 @@
+name: Comment on PR
+
+on:
+  workflow_call:
+    inputs:
+      theme_id:
+        required: false
+        type: string
+      share_output:
+        required: false
+        type: string
+      pr_number:
+        required: true
+        type: string
+      store_alias:
+        required: false
+        type: string
+      store_alias_secret:
+        required: false
+        type: string
+    secrets:
+      SHOPIFY_STORE_URL:
+        required: false
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Post preview comment
+        uses: actions/github-script@v7
+        env:
+          SHOPIFY_STORE_URL: ${{ secrets.SHOPIFY_STORE_URL }}
+          THEME_ID: ${{ inputs.theme_id }}
+          SHARE_OUTPUT: ${{ inputs.share_output }}
+          PR_NUMBER: ${{ inputs.pr_number }}
+        with:
+          script: |
+            const issueNumber = parseInt(process.env.PR_NUMBER);
+            const storeDomain = (process.env.SHOPIFY_STORE_URL || '')
+              .replace(/^https?:\/\//, '')
+              .replace(/\/$/, '');
+            const themeId = process.env.THEME_ID || '';
+            const shareOutput = process.env.SHARE_OUTPUT || '';
+
+            let previewUrl = '';
+            let customizeUrl = '';
+            if (storeDomain && themeId) {
+              previewUrl = `https://${storeDomain}?preview_theme_id=${themeId}`;
+              customizeUrl = `https://${storeDomain}/admin/themes/${themeId}/editor`;
+            }
+
+            const parts = [
+              '## 🎨 Theme Preview Generated',
+              '',
+              `**Store:** ${process.env.SHOPIFY_STORE_URL || 'N/A'}`,
+              `**Branch:** ${context.payload.pull_request?.head?.ref || context.ref.replace('refs/heads/', '')}`,
+              `**Commit:** ${(context.payload.pull_request?.head?.sha || context.sha || '').substring(0, 7)}`
+            ];
+
+            if (customizeUrl) {
+              parts.push('', `**Customize URL:** ${customizeUrl}`);
+            }
+            if (previewUrl) {
+              parts.push('', `**Preview URL:** ${previewUrl}`);
+            }
+            if (shareOutput.trim()) {
+              parts.push('', '### Share Output', '```', shareOutput, '```');
+            }
+            parts.push('', '---', '*This preview will be available for 7 days.*');
+
+            await github.rest.issues.createComment({
+              issue_number: issueNumber,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: parts.join('\n')
+            });

package/src/workflows/preview/reusable-extract-pr-number.yml

@@ -0,0 +1,35 @@
+name: Extract PR Number
+
+on:
+  workflow_call:
+    outputs:
+      pr_number:
+        description: "The PR number (padded: 01, 02, etc.)"
+        value: ${{ jobs.extract.outputs.pr_number }}
+      pr_number_unpadded:
+        description: "The PR number (unpadded: 1, 2, etc.)"
+        value: ${{ jobs.extract.outputs.pr_number_unpadded }}
+
+jobs:
+  extract:
+    runs-on: ubuntu-latest
+    outputs:
+      pr_number: ${{ steps.extract.outputs.pr_number }}
+      pr_number_unpadded: ${{ steps.extract.outputs.pr_number_unpadded }}
+    steps:
+      - name: Extract PR number
+        id: extract
+        run: |
+          PR_NUMBER="${{ github.event.pull_request.number }}"
+          if [ -z "$PR_NUMBER" ] || [ "$PR_NUMBER" = "" ]; then
+            PR_NUMBER="${{ github.event.number }}"
+          fi
+
+          if [ -z "$PR_NUMBER" ] || [ "$PR_NUMBER" = "" ]; then
+            echo "Could not extract PR number from event."
+            exit 1
+          fi
+
+          PADDED_PR_NUMBER=$(printf "%02d" "$PR_NUMBER")
+          echo "pr_number=$PADDED_PR_NUMBER" >> $GITHUB_OUTPUT
+          echo "pr_number_unpadded=$PR_NUMBER" >> $GITHUB_OUTPUT

package/src/workflows/preview/reusable-rename-theme.yml

@@ -0,0 +1,73 @@
+name: Rename Theme
+
+on:
+  workflow_call:
+    inputs:
+      theme_id:
+        required: true
+        type: string
+        description: "Theme ID to rename"
+      theme_name:
+        required: true
+        type: string
+        description: "Current theme name"
+      pr_number:
+        required: true
+        type: string
+        description: "PR number to append"
+      store_alias:
+        required: false
+        type: string
+        description: "Store alias for scoped secret lookup"
+      store_alias_secret:
+        required: false
+        type: string
+        description: "Upper snake-case alias for scoped secret lookup"
+    secrets:
+      SHOPIFY_STORE_URL:
+        required: false
+      SHOPIFY_CLI_THEME_TOKEN:
+        required: false
+
+jobs:
+  rename:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Shopify CLI
+        run: npm install -g @shopify/cli @shopify/theme
+
+      - name: Rename theme
+        env:
+          SHOPIFY_STORE_URL: ${{ secrets.SHOPIFY_STORE_URL }}
+          SHOPIFY_CLI_THEME_TOKEN: ${{ secrets.SHOPIFY_CLI_THEME_TOKEN }}
+          THEME_ID: ${{ inputs.theme_id }}
+          THEME_NAME: ${{ inputs.theme_name }}
+          PR_NUMBER: ${{ inputs.pr_number }}
+        run: |
+          if [ -z "$THEME_ID" ] || [ -z "$THEME_NAME" ]; then
+            echo "Missing theme_id/theme_name."
+            exit 1
+          fi
+          if [ -z "$SHOPIFY_STORE_URL" ] || [ -z "$SHOPIFY_CLI_THEME_TOKEN" ]; then
+            echo "Missing Shopify store URL/token for rename."
+            exit 1
+          fi
+
+          NEW_THEME_NAME="${THEME_NAME}-PR${PR_NUMBER}"
+          echo "Renaming theme $THEME_ID to '$NEW_THEME_NAME'..."
+
+          if shopify theme rename \
+            --store "$SHOPIFY_STORE_URL" \
+            --password "$SHOPIFY_CLI_THEME_TOKEN" \
+            --theme "$THEME_ID" \
+            --name "$NEW_THEME_NAME" 2>&1; then
+            echo "Rename succeeded with password auth."
+          elif shopify theme rename \
+            --store "$SHOPIFY_STORE_URL" \
+            --theme "$THEME_ID" \
+            --name "$NEW_THEME_NAME" 2>&1; then
+            echo "Rename succeeded with authenticated session."
+          else
+            echo "Failed to rename theme."
+            exit 1
+          fi