climaybe 1.5.0 → 1.5.2

package/README.md

@@ -169,8 +169,8 @@ Enabled via `climaybe init` prompt (`Enable preview + cleanup workflows?`).
 
 | Workflow | Trigger | What it does |
 |----------|---------|-------------|
-| `pr-update.yml` | PR opened/synchronize/reopened | Shares draft theme, renames with `-PR<number>`, comments preview + customize URLs |
-| `pr-close.yml` | PR closed | Deletes matching preview themes and comments deleted count + names |
+| `pr-update.yml` | PR opened/synchronize/reopened (base: main, staging, develop, staging-*, live-*) | Shares draft theme, renames with `-PR<number>`, comments preview + customize URLs; uses default store for main/staging/develop, or the store for staging-&lt;alias&gt;/live-&lt;alias&gt; |
+| `pr-close.yml` | PR closed (same branch set) | Deletes matching preview themes and comments deleted count + names |
 | `reusable-share-theme.yml` | workflow_call | Shares Shopify draft theme and returns `theme_id` |
 | `reusable-rename-theme.yml` | workflow_call | Renames shared theme to include `PR<number>` (fails job on rename failure) |
 | `reusable-comment-on-pr.yml` | workflow_call | Posts preview comment including Customize URL |
@@ -232,7 +232,7 @@ Add the following secrets to your GitHub repository (or use **GitLab CI/CD varia
 
 **Store URL:** During `climaybe init` (or `add-store`), store URL secret(s) are set from your configured store domain(s); you are only prompted for the theme token.
 
-**Multi-store:** Per-store secrets `SHOPIFY_STORE_URL_<ALIAS>` and `SHOPIFY_THEME_ACCESS_TOKEN_<ALIAS>` — the URL is set from config; you must provide the theme token per store. `<ALIAS>` is uppercase with hyphens as underscores (e.g. `voldt-norway` → `SHOPIFY_STORE_URL_VOLDT_NORWAY`).
+**Multi-store:** Per-store secrets `SHOPIFY_STORE_URL_<ALIAS>` and `SHOPIFY_THEME_ACCESS_TOKEN_<ALIAS>` — the URL is set from config; you must provide the theme token per store. `<ALIAS>` is uppercase with hyphens as underscores (e.g. `voldt-norway` → `SHOPIFY_STORE_URL_VOLDT_NORWAY`). Preview and cleanup: for PRs targeting **main**, **staging**, or **develop** the workflows use the **default store** (from `config.default_store` or first in `config.stores`); for PRs targeting **staging-&lt;alias&gt;** or **live-&lt;alias&gt;** they use that store’s credentials. Set either the plain `SHOPIFY_*` secrets or the `_<ALIAS>` pair for each store you use in preview.
 
 ## Directory Structure (Multi-store)
 

package/bin/version.txt

@@ -1 +1 @@
-1.5.0
+1.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Shopify CI/CD CLI — scaffolds workflows, branch strategy, and store config for single-store and multi-store theme repos",
   "type": "module",
   "bin": {

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

@@ -24,6 +24,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 2
 
       - name: Skip if this is a sync commit
         id: gate
@@ -41,6 +42,29 @@ jobs:
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
 
+      - name: Keep store-specific paths (e.g. locales) after main sync
+        if: steps.gate.outputs.skip != 'true'
+        run: |
+          # After a main→staging merge, restore store-specific paths from the pre-merge commit
+          # so they are not overwritten by main. Only run when paths exist (no pathspec error).
+          if [ ! -d "locales" ]; then
+            echo "No locales/ directory, skipping."
+            exit 0
+          fi
+          PARENT=$(git rev-parse HEAD^1 2>/dev/null || echo "")
+          if [ -z "$PARENT" ]; then
+            echo "Not a merge commit or shallow clone, skipping."
+            exit 0
+          fi
+          find locales -name "*.json" 2>/dev/null | while read -r f; do
+            git checkout "$PARENT" -- "$f" 2>/dev/null || true
+          done
+          if git diff --quiet; then
+            echo "No store-specific locale changes to restore."
+          else
+            echo "Restored store-specific locale files from pre-merge commit."
+          fi
+
       - name: Extract store alias from branch name
         if: steps.gate.outputs.skip != 'true'
         id: alias

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

@@ -6,17 +6,77 @@ name: PR Close
 on:
   pull_request:
     types: [closed]
-    branches: [main, staging, develop]
+    branches: [main, staging, develop, 'staging-*', 'live-*']
 
 jobs:
   extract-pr-number:
     uses: ./.github/workflows/reusable-extract-pr-number.yml
 
+  resolve-store:
+    runs-on: ubuntu-latest
+    outputs:
+      store_alias_secret: ${{ steps.resolve.outputs.alias_secret }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Resolve store alias 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 pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+              const stores = pkg?.config?.stores || {};
+              const defaultStoreRaw = pkg?.config?.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;
+                  }
+                }
+              }
+              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 [ -z "$ALIAS" ]; then
+            echo "Could not resolve store alias from package.json config or base branch."
+            exit 1
+          fi
+
+          ALIAS_SECRET=$(echo "$ALIAS" | tr '[:lower:]-' '[:upper:]_')
+          echo "alias=$ALIAS" >> $GITHUB_OUTPUT
+          echo "alias_secret=$ALIAS_SECRET" >> $GITHUB_OUTPUT
+
   cleanup-theme:
-    needs: extract-pr-number
+    needs: [extract-pr-number, resolve-store]
     uses: ./.github/workflows/reusable-cleanup-themes.yml
     with:
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
+      store_alias_secret: ${{ needs.resolve-store.outputs.store_alias_secret }}
     secrets: inherit
 
   comment-on-pr:

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

@@ -7,7 +7,7 @@ name: PR Update
 on:
   pull_request:
     types: [opened, synchronize, reopened]
-    branches: [main, staging, develop]
+    branches: [main, staging, develop, 'staging-*', 'live-*']
 
 jobs:
   extract-pr-number:
@@ -22,40 +22,48 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Resolve default store alias
+      - name: Resolve store alias from base branch
         id: resolve
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
         run: |
-          ALIAS=$(node -e "
-            const fs = require('fs');
-            const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
-            const stores = pkg?.config?.stores || {};
-            const defaultStoreRaw = pkg?.config?.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;
+          # 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 pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+              const stores = pkg?.config?.stores || {};
+              const defaultStoreRaw = pkg?.config?.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;
+                  }
                 }
               }
-            }
-            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);
-          ")
+              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 [ -z "$ALIAS" ]; then
             echo "Could not resolve default store alias from package.json config."
@@ -87,10 +95,11 @@ jobs:
           echo "Shopify credentials are configured for alias: ${{ steps.resolve.outputs.alias }}"
 
   cleanup-themes:
-    needs: extract-pr-number
+    needs: [extract-pr-number, validate-environment]
     uses: ./.github/workflows/reusable-cleanup-themes.yml
     with:
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
+      store_alias_secret: ${{ needs.validate-environment.outputs.store_alias_secret }}
     secrets: inherit
 
   share-theme:
@@ -99,9 +108,8 @@ jobs:
     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_THEME_ACCESS_TOKEN: ${{ secrets[format('SHOPIFY_THEME_ACCESS_TOKEN_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
+      store_alias_secret: ${{ needs.validate-environment.outputs.store_alias_secret }}
+    secrets: inherit
 
   rename-theme:
     needs: [share-theme, extract-pr-number, validate-environment]
@@ -111,9 +119,8 @@ jobs:
       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_THEME_ACCESS_TOKEN: ${{ secrets[format('SHOPIFY_THEME_ACCESS_TOKEN_{0}', needs.validate-environment.outputs.store_alias_secret)] || secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
+      store_alias_secret: ${{ needs.validate-environment.outputs.store_alias_secret }}
+    secrets: inherit
 
   comment-on-pr:
     needs: [share-theme, rename-theme, extract-pr-number, validate-environment]
@@ -123,5 +130,5 @@ jobs:
       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 }}
+      store_alias_secret: ${{ needs.validate-environment.outputs.store_alias_secret }}
+    secrets: inherit

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

@@ -7,6 +7,10 @@ on:
         required: true
         type: string
         description: "PR number to clean up themes for"
+      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."
     outputs:
       deleted_count:
         description: "Number of deleted themes"
@@ -28,13 +32,16 @@ jobs:
       - name: Cleanup PR preview themes
         id: cleanup
         env:
-          SHOPIFY_STORE_URL: ${{ secrets.SHOPIFY_STORE_URL }}
-          SHOPIFY_THEME_ACCESS_TOKEN: ${{ secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
+          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 }}
         run: |
           if [ -z "$SHOPIFY_STORE_URL" ] || [ -z "$SHOPIFY_THEME_ACCESS_TOKEN" ]; then
-            echo "Missing Shopify secrets."
-            exit 1
+            echo "Missing Shopify secrets; skipping theme cleanup (no themes deleted)."
+            echo "deleted_count=0" >> $GITHUB_OUTPUT
+            echo "deleted_themes<<DELETED_EOF" >> $GITHUB_OUTPUT
+            echo "DELETED_EOF" >> $GITHUB_OUTPUT
+            exit 0
           fi
 
           THEME_LIST=$(shopify theme list \

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

@@ -18,9 +18,7 @@ on:
       store_alias_secret:
         required: false
         type: string
-    secrets:
-      SHOPIFY_STORE_URL:
-        required: false
+        description: "Upper snake-case alias for scoped secret (e.g. VOLDT_STAGING). If set, uses SHOPIFY_STORE_URL_<this>; else uses SHOPIFY_STORE_URL."
 
 jobs:
   comment:
@@ -29,7 +27,7 @@ jobs:
       - name: Post preview comment
         uses: actions/github-script@v7
         env:
-          SHOPIFY_STORE_URL: ${{ secrets.SHOPIFY_STORE_URL }}
+          SHOPIFY_STORE_URL: ${{ inputs.store_alias_secret && secrets[format('SHOPIFY_STORE_URL_{0}', inputs.store_alias_secret)] || secrets.SHOPIFY_STORE_URL }}
           THEME_ID: ${{ inputs.theme_id }}
           SHARE_OUTPUT: ${{ inputs.share_output }}
           PR_NUMBER: ${{ inputs.pr_number }}

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

@@ -22,12 +22,7 @@ on:
       store_alias_secret:
         required: false
         type: string
-        description: "Upper snake-case alias for scoped secret lookup"
-    secrets:
-      SHOPIFY_STORE_URL:
-        required: false
-      SHOPIFY_THEME_ACCESS_TOKEN:
-        required: false
+        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."
 
 jobs:
   rename:
@@ -38,8 +33,8 @@ jobs:
 
       - name: Rename theme
         env:
-          SHOPIFY_STORE_URL: ${{ secrets.SHOPIFY_STORE_URL }}
-          SHOPIFY_THEME_ACCESS_TOKEN: ${{ secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
+          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 }}
           THEME_ID: ${{ inputs.theme_id }}
           THEME_NAME: ${{ inputs.theme_name }}
           PR_NUMBER: ${{ inputs.pr_number }}

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

@@ -14,7 +14,7 @@ on:
       store_alias_secret:
         required: false
         type: string
-        description: "Upper snake-case alias for scoped secret lookup"
+        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."
     outputs:
       theme_id:
         description: "Shared theme ID"
@@ -25,11 +25,6 @@ on:
       share_output:
         description: "Raw share command output"
         value: ${{ jobs.share.outputs.share_output }}
-    secrets:
-      SHOPIFY_STORE_URL:
-        required: false
-      SHOPIFY_THEME_ACCESS_TOKEN:
-        required: false
 
 jobs:
   share:
@@ -55,8 +50,8 @@ jobs:
       - name: Share theme
         id: share
         env:
-          SHOPIFY_STORE_URL: ${{ secrets.SHOPIFY_STORE_URL }}
-          SHOPIFY_THEME_ACCESS_TOKEN: ${{ secrets.SHOPIFY_THEME_ACCESS_TOKEN }}
+          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 }}
         run: |
           if [ -z "$SHOPIFY_STORE_URL" ] || [ -z "$SHOPIFY_THEME_ACCESS_TOKEN" ]; then
             echo "Missing Shopify secrets."