climaybe 1.5.2 → 1.6.0

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

@@ -1,8 +1,7 @@
 # climaybe — Multistore Hotfix to Main
-# Automatically syncs direct hotfixes from staging-<store> or live-<store> back to main.
+# Syncs hotfixes from staging-<store> or live-<store> back to main.
+# Only when the push is NOT from main (main→staging merge would create a loop).
 # 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
 
@@ -49,8 +48,20 @@ jobs:
         run: |
           SOURCE="${{ steps.ref.outputs.branch }}"
 
-          MERGE_BASE=$(git merge-base origin/main origin/$SOURCE 2>/dev/null || echo "")
+          # Do not backport when this push was a merge FROM main (staging-* or live-*; would loop)
+          if [[ "$SOURCE" == staging-* || "$SOURCE" == live-* ]]; then
+            MAIN_SHA=$(git rev-parse origin/main 2>/dev/null || echo "")
+            if [ -n "$MAIN_SHA" ]; then
+              SECOND_PARENT=$(git rev-parse origin/$SOURCE^2 2>/dev/null || echo "")
+              if [ "$SECOND_PARENT" = "$MAIN_SHA" ]; then
+                echo "needs_backport=false" >> $GITHUB_OUTPUT
+                echo "Push is merge from main into $SOURCE; skipping to avoid loop."
+                exit 0
+              fi
+            fi
+          fi
 
+          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

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

@@ -1,7 +1,7 @@
-# climaybe — Root to Stores (Multi-store)
-# When direct commits (hotfixes) land on live-* branches,
-# syncs root JSON files back to stores/<alias>/ directory.
-# This prepares the data for backporting to main.
+# climaybe — Root to Stores / Stores to Root (Multi-store, live-*)
+# Same logic as stores-to-root on staging-*: direction depends on source.
+# Push to live-* from MAIN (merge): copy stores/<alias>/ → root.
+# Push to live-* from ELSEWHERE (direct, Shopify, etc.): copy root → stores/<alias>/.
 
 name: Root to Stores
 
@@ -24,16 +24,30 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
 
-      - name: Skip workflow commits
+      - name: Skip if our own sync commit; detect if push from main
         id: gate
         run: |
           COMMIT_MSG="${{ github.event.head_commit.message }}"
           if echo "$COMMIT_MSG" | grep -qE "\[root-to-stores\]|\[stores-to-root\]|\[hotfix-backport\]|chore\(release\)"; then
             echo "skip=true" >> $GITHUB_OUTPUT
+            echo "from_main=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          # Detect: is this push a merge FROM main? (second parent = main)
+          MAIN_SHA=$(git rev-parse origin/main 2>/dev/null || echo "")
+          if [ -z "$MAIN_SHA" ]; then
+            echo "from_main=false" >> $GITHUB_OUTPUT
           else
-            echo "skip=false" >> $GITHUB_OUTPUT
+            SECOND_PARENT=$(git rev-parse HEAD^2 2>/dev/null || echo "")
+            if [ "$SECOND_PARENT" = "$MAIN_SHA" ]; then
+              echo "from_main=true" >> $GITHUB_OUTPUT
+            else
+              echo "from_main=false" >> $GITHUB_OUTPUT
+            fi
           fi
+          echo "skip=false" >> $GITHUB_OUTPUT
 
       - name: Extract store alias
         if: steps.gate.outputs.skip != 'true'
@@ -42,25 +56,59 @@ jobs:
           BRANCH="${{ github.ref_name }}"
           ALIAS="${BRANCH#live-}"
           echo "alias=$ALIAS" >> $GITHUB_OUTPUT
+          echo "Store alias: $ALIAS (from_main=${{ steps.gate.outputs.from_main }})"
 
-      - name: Sync root to stores/<alias>/
-        if: steps.gate.outputs.skip != 'true'
+      # --- When push is FROM MAIN: stores → root ---
+      - name: Sync stores/<alias>/ to root (main merged in)
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == 'true'
         run: |
           ALIAS="${{ steps.alias.outputs.alias }}"
           STORE_DIR="stores/${ALIAS}"
+          if [ ! -d "$STORE_DIR" ]; then
+            echo "Store directory $STORE_DIR does not exist, skipping."
+            exit 0
+          fi
+          for DIR in config templates sections; do
+            SRC="${STORE_DIR}/${DIR}"
+            if [ -d "$SRC" ]; then
+              find "$SRC" -name "*.json" | while read -r FILE; do
+                REL_PATH="${FILE#$STORE_DIR/}"
+                if [ "$REL_PATH" = "config/settings_schema.json" ]; then
+                  continue
+                fi
+                mkdir -p "$(dirname "$REL_PATH")"
+                cp "$FILE" "$REL_PATH"
+                echo "  Copied: $REL_PATH"
+              done
+            fi
+          done
 
-          # Ensure store directory exists
-          mkdir -p "${STORE_DIR}/config" "${STORE_DIR}/templates" "${STORE_DIR}/sections"
+      - name: Commit stores→root
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == 'true'
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add -A
+          if ! git diff --cached --quiet; then
+            git commit -m "chore: sync stores/${{ steps.alias.outputs.alias }}/ to root [stores-to-root]"
+            git push
+          else
+            echo "No changes to commit."
+          fi
 
-          # Sync directories: config, templates, sections
+      # --- When push is NOT from main: root → stores/<alias>/ ---
+      - name: Sync root to stores/<alias>/ (external push)
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == 'false'
+        run: |
+          ALIAS="${{ steps.alias.outputs.alias }}"
+          STORE_DIR="stores/${ALIAS}"
+          mkdir -p "${STORE_DIR}/config" "${STORE_DIR}/templates" "${STORE_DIR}/sections"
           for DIR in config templates sections; do
             if [ -d "$DIR" ]; then
               find "$DIR" -name "*.json" | while read -r FILE; do
-                # Skip excluded files
                 if [ "$FILE" = "config/settings_schema.json" ]; then
                   continue
                 fi
-
                 DEST="${STORE_DIR}/${FILE}"
                 mkdir -p "$(dirname "$DEST")"
                 cp "$FILE" "$DEST"
@@ -69,12 +117,11 @@ jobs:
             fi
           done
 
-      - name: Commit changes
-        if: steps.gate.outputs.skip != 'true'
+      - name: Commit root→stores
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == 'false'
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-
           git add -A
           if ! git diff --cached --quiet; then
             git commit -m "chore: sync root to stores/${{ steps.alias.outputs.alias }}/ [root-to-stores]"

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

@@ -1,6 +1,7 @@
-# climaybe — Stores to Root (Multi-store)
-# When a push happens on staging-* branches (e.g., after main sync),
-# copies JSON files from stores/<alias>/ to the repo root.
+# climaybe — Stores to Root / Root to Stores (Multi-store, staging-*)
+# Push to staging-* from MAIN (merge): copy stores/<alias>/ → root (store-specific on top of main).
+# Push to staging-* from ELSEWHERE (Shopify, direct, feature branch): copy root → stores/<alias>/
+# so store-specific JSON changes are persisted, then hotfix-to-main can backport.
 
 name: Stores to Root
 
@@ -24,80 +25,80 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 2
+          fetch-depth: 0
 
-      - name: Skip if this is a sync commit
+      - name: Skip if this is our own sync commit
         id: gate
         run: |
-          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
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "skip=false" >> $GITHUB_OUTPUT
+            echo "from_main=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          COMMIT_MSG="${{ github.event.head_commit.message }}"
+          if echo "$COMMIT_MSG" | grep -qE "\[stores-to-root\]|\[root-to-stores\]"; then
+            echo "skip=true" >> $GITHUB_OUTPUT
+            echo "from_main=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          # Detect: is this push a merge FROM main? (merge commit with second parent = main)
+          MAIN_SHA=$(git rev-parse origin/main 2>/dev/null || echo "")
+          if [ -z "$MAIN_SHA" ]; then
+            echo "from_main=false" >> $GITHUB_OUTPUT
+          else
+            SECOND_PARENT=$(git rev-parse HEAD^2 2>/dev/null || echo "")
+            if [ "$SECOND_PARENT" = "$MAIN_SHA" ]; then
+              echo "from_main=true" >> $GITHUB_OUTPUT
             else
-              echo "skip=false" >> $GITHUB_OUTPUT
+              echo "from_main=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
+          echo "skip=false" >> $GITHUB_OUTPUT
 
-      - name: Keep store-specific paths (e.g. locales) after main sync
+      - name: Extract store alias from branch name
         if: steps.gate.outputs.skip != 'true'
+        id: alias
+        run: |
+          BRANCH="${{ github.ref_name }}"
+          ALIAS="${BRANCH#staging-}"
+          echo "alias=$ALIAS" >> $GITHUB_OUTPUT
+          echo "Store alias: $ALIAS (from_main=${{ steps.gate.outputs.from_main }})"
+
+      # --- When push is FROM MAIN: stores → root, and restore store-specific locales ---
+      - name: Keep store-specific paths (e.g. locales) after main sync
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == '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
+          if ! git diff --quiet; then
             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
-        run: |
-          BRANCH="${{ github.ref_name }}"
-          ALIAS="${BRANCH#staging-}"
-          echo "alias=$ALIAS" >> $GITHUB_OUTPUT
-          echo "Store alias: $ALIAS"
-
-      - name: Sync stores/<alias>/ to root
-        if: steps.gate.outputs.skip != 'true'
+      - name: Sync stores/<alias>/ to root (main merged in)
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == 'true'
         run: |
           ALIAS="${{ steps.alias.outputs.alias }}"
           STORE_DIR="stores/${ALIAS}"
-
           if [ ! -d "$STORE_DIR" ]; then
             echo "Store directory $STORE_DIR does not exist, skipping."
             exit 0
           fi
-
-          # Sync directories: config, templates, sections
           for DIR in config templates sections; do
             SRC="${STORE_DIR}/${DIR}"
             if [ -d "$SRC" ]; then
-              # Copy JSON files only, preserving directory structure
               find "$SRC" -name "*.json" | while read -r FILE; do
                 REL_PATH="${FILE#$STORE_DIR/}"
-
-                # Skip excluded files
                 if [ "$REL_PATH" = "config/settings_schema.json" ]; then
                   continue
                 fi
-
                 mkdir -p "$(dirname "$REL_PATH")"
                 cp "$FILE" "$REL_PATH"
                 echo "  Copied: $REL_PATH"
@@ -105,12 +106,11 @@ jobs:
             fi
           done
 
-      - name: Commit changes
-        if: steps.gate.outputs.skip != 'true'
+      - name: Commit stores→root
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == 'true'
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-
           git add -A
           if ! git diff --cached --quiet; then
             git commit -m "chore: sync stores/${{ steps.alias.outputs.alias }}/ to root [stores-to-root]"
@@ -118,3 +118,37 @@ jobs:
           else
             echo "No changes to commit."
           fi
+
+      # --- When push is NOT from main: root → stores/<alias>/ (persist store JSONs) ---
+      - name: Sync root to stores/<alias>/ (external push, e.g. Shopify)
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == 'false'
+        run: |
+          ALIAS="${{ steps.alias.outputs.alias }}"
+          STORE_DIR="stores/${ALIAS}"
+          mkdir -p "${STORE_DIR}/config" "${STORE_DIR}/templates" "${STORE_DIR}/sections"
+          for DIR in config templates sections; do
+            if [ -d "$DIR" ]; then
+              find "$DIR" -name "*.json" | while read -r FILE; do
+                if [ "$FILE" = "config/settings_schema.json" ]; then
+                  continue
+                fi
+                DEST="${STORE_DIR}/${FILE}"
+                mkdir -p "$(dirname "$DEST")"
+                cp "$FILE" "$DEST"
+                echo "  Synced: $FILE → $DEST"
+              done
+            fi
+          done
+
+      - name: Commit root→stores
+        if: steps.gate.outputs.skip != 'true' && steps.gate.outputs.from_main == 'false'
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add -A
+          if ! git diff --cached --quiet; then
+            git commit -m "chore: sync root to stores/${{ steps.alias.outputs.alias }}/ [root-to-stores]"
+            git push
+          else
+            echo "No changes to commit."
+          fi

package/src/workflows/shared/version-bump.yml

@@ -60,8 +60,25 @@ jobs:
             fi
             NEW_VERSION="v${NEW_VERSION}"
           else
-            # Get latest tag
-            LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+            # Get latest tag (or theme_version from settings_schema.json when no tags)
+            LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+            if [ -z "$LATEST_TAG" ]; then
+              SCHEMA="config/settings_schema.json"
+              if [ -f "$SCHEMA" ]; then
+                LATEST_TAG=$(node -e "
+                  const fs = require('fs');
+                  const arr = JSON.parse(fs.readFileSync('$SCHEMA', 'utf-8'));
+                  const info = arr.find(x => x.name === 'theme_info');
+                  const v = (info && info.theme_version) ? String(info.theme_version).trim() : '';
+                  if (!v) process.exit(1);
+                  let parts = v.replace(/^v/i, '').split('.');
+                  if (parts.length === 2) parts.push('0');
+                  if (parts.length < 3) parts = parts.concat(Array(3 - parts.length).fill('0')).slice(0, 3);
+                  console.log('v' + parts.slice(0, 3).join('.'));
+                " 2>/dev/null || true)
+              fi
+              [ -z "$LATEST_TAG" ] && LATEST_TAG="v0.0.0"
+            fi
             LATEST_TAG="${LATEST_TAG#v}"
 
             IFS='.' read -r MAJOR MINOR PATCH <<< "$LATEST_TAG"

package/src/workflows/single/nightly-hotfix.yml

@@ -1,7 +1,8 @@
-# climaybe — Nightly Hotfix Tagger (Single-store)
+# climaybe — Nightly Hotfix Tagger (Single-store & Multi-store)
 # Runs at 02:00 US Eastern (07:00 UTC) every night.
-# If there are untagged commits on main (not from staging merges),
-# generates a changelog and creates a patch version tag.
+# Collects commits since latest tag (excluding release bumps and store-sync noise),
+# generates AI changelog, and creates a patch version tag.
+# Hotfix / non-staging merges are tagged here only (not at commit time).
 
 name: Nightly Hotfix Tag
 
@@ -20,6 +21,8 @@ concurrency:
 jobs:
   check:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     outputs:
       has_changes: ${{ steps.check.outputs.has_changes }}
       last_tag: ${{ steps.check.outputs.last_tag }}
@@ -27,34 +30,60 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Check for untagged commits
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Check for untagged commits (or create initial tag from settings_schema.json)
         id: check
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+          if [ -z "$LATEST_TAG" ]; then
+            SCHEMA="config/settings_schema.json"
+            if [ -f "$SCHEMA" ]; then
+              LATEST_TAG=$(node -e "
+                const fs = require('fs');
+                const arr = JSON.parse(fs.readFileSync('$SCHEMA', 'utf-8'));
+                const info = arr.find(x => x.name === 'theme_info');
+                const v = (info && info.theme_version) ? String(info.theme_version).trim() : '';
+                if (!v) process.exit(1);
+                let parts = v.replace(/^v/i, '').split('.');
+                if (parts.length === 2) parts.push('0');
+                if (parts.length < 3) parts = parts.concat(Array(3 - parts.length).fill('0')).slice(0, 3);
+                console.log('v' + parts.slice(0, 3).join('.'));
+              " 2>/dev/null || true)
+            fi
+            if [ -n "$LATEST_TAG" ]; then
+              if ! git rev-parse -q --verify "refs/tags/$LATEST_TAG" >/dev/null; then
+                git tag -a "$LATEST_TAG" -m "Initial version from settings_schema.json"
+                git push origin "$LATEST_TAG"
+                echo "Created initial tag $LATEST_TAG from settings_schema.json"
+              fi
+            fi
+          fi
 
           if [ -z "$LATEST_TAG" ]; then
-            echo "No tags found, skipping."
+            echo "No tags and no settings_schema.json theme_version, skipping."
             echo "has_changes=false" >> $GITHUB_OUTPUT
             exit 0
           fi
 
           echo "last_tag=$LATEST_TAG" >> $GITHUB_OUTPUT
 
-          # Collect candidate commits since last tag.
-          # Exclude known workflow/system commits first, then exclude commits
-          # that are associated with PRs whose source branch is staging-*.
+          # Commits since last tag; exclude only version-bump and store-sync noise.
+          # Include [hotfix-backport] and commits with no PR (e.g. direct merges).
           CANDIDATES=$(git log ${LATEST_TAG}..HEAD --pretty=format:"%H%x09%s" | \
             grep -v "chore(release): bump version" | \
-            grep -v "\[hotfix-backport\]" | \
             grep -v "\[skip-store-sync\]" | \
             grep -v "\[stores-to-root\]" | \
             grep -v "\[root-to-stores\]" || true)
 
           COMMITS=""
-          SKIPPED_UNKNOWN=0
           while IFS=$'\t' read -r SHA SUBJECT; do
             [ -z "$SHA" ] && continue
 
@@ -62,13 +91,8 @@ jobs:
               repos/${{ github.repository }}/commits/$SHA/pulls \
               --jq '.[0].head.ref // ""' 2>/dev/null || true)
 
-            if [ -z "$HEAD_REF" ]; then
-              SKIPPED_UNKNOWN=$((SKIPPED_UNKNOWN + 1))
-              echo "Skipping commit due to missing PR metadata: $SHA"
-              continue
-            fi
-
-            if [[ "$HEAD_REF" == staging-* ]]; then
+            # Skip only store-sync PRs (staging-* → main). Include staging and everything else.
+            if [[ -n "$HEAD_REF" && "$HEAD_REF" == staging-* ]]; then
               echo "Skipping store-backport commit from $HEAD_REF: $SHA"
               continue
             fi
@@ -76,16 +100,12 @@ jobs:
             COMMITS="${COMMITS}${SUBJECT}"$'\n'
           done <<< "$CANDIDATES"
 
-          if [ "$SKIPPED_UNKNOWN" -gt 0 ]; then
-            echo "Skipped $SKIPPED_UNKNOWN commit(s) due to missing PR metadata (fail-safe)."
-          fi
-
           if [ -n "$COMMITS" ]; then
             COMMIT_COUNT=$(echo "$COMMITS" | wc -l | tr -d ' ')
             echo "Found $COMMIT_COUNT untagged commit(s) since $LATEST_TAG"
             echo "has_changes=true" >> $GITHUB_OUTPUT
           else
-            echo "No untagged hotfix commits since $LATEST_TAG"
+            echo "No untagged commits since $LATEST_TAG"
             echo "has_changes=false" >> $GITHUB_OUTPUT
           fi