climaybe 1.6.1 → 1.7.0

package/README.md

@@ -39,8 +39,8 @@ Interactive setup that configures your repo for CI/CD.
 1. Prompts for your store URL (e.g., `voldt-staging.myshopify.com`)
 2. Extracts subdomain as alias, lets you override
 3. Asks if you want to add more stores
-4. Asks whether to enable optional **preview + cleanup** workflows
-5. Asks whether to enable optional **build + Lighthouse** workflows
+4. Asks whether to enable optional **preview + cleanup** workflows (default: yes)
+5. Asks whether to enable optional **build + Lighthouse** workflows (default: yes)
 6. Asks whether to enable **commitlint + Husky** (enforce [conventional commits](https://www.conventionalcommits.org/) on `git commit`)
 7. Asks whether to add **Cursor commit skill** to the project (`.cursor/skills/commit/SKILL.md`) for AI-assisted conventional commits
 8. Based on store count, sets up **single-store** or **multi-store** mode
@@ -193,7 +193,7 @@ Direct pushes to `staging-<store>` or `live-<store>` are automatically synced ba
 
 ### Optional preview + cleanup package
 
-Enabled via `climaybe init` prompt (`Enable preview + cleanup workflows?`).
+Enabled via `climaybe init` prompt (`Enable preview + cleanup workflows?`; default: yes).
 
 | Workflow | Trigger | What it does |
 |----------|---------|-------------|
@@ -207,7 +207,7 @@ Enabled via `climaybe init` prompt (`Enable preview + cleanup workflows?`).
 
 ### Optional build + Lighthouse package
 
-Enabled via `climaybe init` prompt (`Enable build + Lighthouse workflows?`).
+Enabled via `climaybe init` prompt (`Enable build + Lighthouse workflows?`; default: yes).
 
 | Workflow | Trigger | What it does |
 |----------|---------|-------------|

package/bin/version.txt

@@ -1 +1 @@
-1.6.1
+1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Shopify CI/CD CLI — scaffolds workflows, branch strategy, and store config for single-store and multi-store theme repos",
   "type": "module",
   "bin": {
@@ -42,6 +42,7 @@
       [
         "@semantic-release/commit-analyzer",
         {
+          "preset": "conventionalcommits",
           "releaseRules": [
             {
               "type": "ci",
@@ -68,7 +69,7 @@
             "package.json",
             "package-lock.json"
           ],
-          "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+          "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}"
         }
       ]
     ]

package/src/lib/commit-tooling.js

@@ -18,6 +18,7 @@ module.exports = {
       'always',
       ['feat', 'fix', 'docs', 'style', 'refactor', 'perf', 'test', 'build', 'ci', 'chore'],
     ],
+    'subject-empty': [0],
     'header-max-length': [2, 'always', 100],
     'body-max-line-length': [2, 'always', 200],
   },
@@ -34,19 +35,19 @@ description: Groups working-tree changes into logical commits and commits them u
 
 # Commit (group + conventional)
 
-Group changes by purpose, then commit each group with a valid conventional message so commitlint and semantic-release stay happy.
+Group changes by purpose, then commit each group. A conventional message is optional; when the user provides or wants one, use the format below so commitlint and semantic-release stay happy.
 
 ## Workflow
 
 1. **Inspect** — Get full picture of changes (git status, git diff).
 2. **Group** — Partition by type: feat, fix, docs, style, refactor, perf, test, build, ci, chore.
-3. **Commit each group** — type(scope): subject, imperative, lowercase, no period, ≤100 chars.
-4. **Validate** — commit-msg hook will reject invalid messages.
+3. **Commit each group** — If the user wants a message: type(scope): subject, imperative, lowercase, no period, ≤100 chars. If they don't, commit without message or with a minimal one (e.g. chore: wip).
+4. **Validate** — commit-msg hook may reject invalid messages when a message is used.
 
-## Message rules (commitlint)
+## Message rules (commitlint, when a message is used)
 
 - **Types:** feat, fix, docs, style, refactor, perf, test, build, ci, chore.
-- **Header:** type(scope): subject — subject max 100 chars. Body lines max 200.
+- **Header:** type(scope): subject — subject optional; max 100 chars when present. Body lines max 200.
 - **Imperative, present tense:** "add feature" not "added feature".
 
 ## Examples

package/src/lib/prompts.js

@@ -128,7 +128,7 @@ export async function promptPreviewWorkflows() {
     type: 'confirm',
     name: 'enablePreviewWorkflows',
     message: 'Enable preview + cleanup workflows?',
-    initial: false,
+    initial: true,
   });
 
   return !!enablePreviewWorkflows;
@@ -142,7 +142,7 @@ export async function promptBuildWorkflows() {
     type: 'confirm',
     name: 'enableBuildWorkflows',
     message: 'Enable build + Lighthouse workflows?',
-    initial: false,
+    initial: true,
   });
 
   return !!enableBuildWorkflows;

package/src/workflows/build/build-pipeline.yml

@@ -8,6 +8,13 @@ on:
 
 jobs:
   build:
+    # Skip pure store-sync + hotfix-backport commits; those are infrastructure-only
+    # syncs from staging/live stores back to main and should not trigger heavy theme
+    # review / build pipelines.
+    if: >
+      !contains(github.event.head_commit.message, '[hotfix-backport]')
+      && !contains(github.event.head_commit.message, '[stores-to-root]')
+      && !contains(github.event.head_commit.message, '[root-to-stores]')
     uses: ./.github/workflows/reusable-build.yml
 
   lighthouse-gate:

package/src/workflows/multi/main-to-staging-stores.yml

@@ -5,12 +5,19 @@
 # Runs on every push to main except pure store-sync commits ([stores-to-root], [root-to-stores]), so that:
 # - Version-bump commits: staging-<alias> get the new version.
 # - Hotfix backports (live or staging-<alias> → main): other staging-<alias> get those changes; the store that sent the hotfix is skipped (no need to merge back to the same branch).
+#
+# Also runs when Post-Merge Tag or Nightly Hotfix Tag complete: version-bump pushes with GITHUB_TOKEN,
+# which does not trigger push-based workflows, so we explicitly run sync after those workflows finish.
 
 name: Main to Staging Stores
 
 on:
   push:
     branches: [main]
+  workflow_run:
+    workflows: ['Post-Merge Tag', 'Nightly Hotfix Tag']
+    types: [completed]
+    branches: [main]
 
 # Prevent concurrent store pushes
 concurrency:
@@ -19,8 +26,11 @@ concurrency:
 
 jobs:
   # Gate: skip only pure store-sync commits. When hotfix-backport, extract source branch alias so we skip merging back into that same store.
+  # When triggered by workflow_run (version-bump finished), run sync if the workflow succeeded.
   gate:
     runs-on: ubuntu-latest
+    # workflow_run: only sync when Post-Merge or Nightly Hotfix completed successfully (version-bump pushed)
+    if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
     outputs:
       should_run: ${{ steps.check.outputs.should_run }}
       hotfix_source_alias: ${{ steps.check.outputs.hotfix_source_alias }}
@@ -28,6 +38,13 @@ jobs:
       - name: Check commit message and hotfix source
         id: check
         run: |
+          if [ "${{ github.event_name }}" = "workflow_run" ]; then
+            echo "Triggered by workflow_run (version-bump finished); syncing main to staging."
+            echo "should_run=true" >> $GITHUB_OUTPUT
+            echo "hotfix_source_alias=" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
           COMMIT_MSG="${{ github.event.head_commit.message }}"
 
           if echo "$COMMIT_MSG" | grep -qE "\[skip-store-sync\]|\[stores-to-root\]|\[root-to-stores\]"; then
@@ -94,6 +111,7 @@ jobs:
 
       - name: Sync main to staging-${{ matrix.store }} (root JSONs ignored)
         run: |
+          git fetch origin main
           BRANCH="staging-${{ matrix.store }}"
           ALIAS="${{ matrix.store }}"
           STORE_DIR="stores/${ALIAS}"

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

@@ -43,10 +43,35 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Resolve default store alias
+        id: default_store
+        run: |
+          DEFAULT_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] || '';
+            process.stdout.write(alias);
+          ")
+          echo "alias=$DEFAULT_ALIAS" >> $GITHUB_OUTPUT
+          echo "Default store alias: $DEFAULT_ALIAS"
+
       - name: Check if backport is needed
         id: check
         run: |
           SOURCE="${{ steps.ref.outputs.branch }}"
+          SOURCE_ALIAS="${SOURCE#staging-}"
+          SOURCE_ALIAS="${SOURCE_ALIAS#live-}"
+          DEFAULT_ALIAS="${{ steps.default_store.outputs.alias }}"
 
           # Do not backport when this push was a merge FROM main (staging-* or live-*; would loop)
           if [[ "$SOURCE" == staging-* || "$SOURCE" == live-* ]]; then
@@ -67,11 +92,19 @@ jobs:
             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)
+          # Default store: commits outside stores/ (root + code) trigger backport.
+          # Non-default store: only commits under stores/<alias>/ trigger backport; root JSON must not overwrite main.
+          if [ -n "$DEFAULT_ALIAS" ] && [ "$SOURCE_ALIAS" = "$DEFAULT_ALIAS" ]; then
+            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)
+          else
+            COMMITS=$(git log --oneline ${MERGE_BASE}..origin/$SOURCE -- "stores/${SOURCE_ALIAS}/" 2>/dev/null | \
+              grep -v "\[stores-to-root\]" | grep -v "\[root-to-stores\]" | grep -v "chore(release)" || true)
+          fi
 
           if [ -n "$COMMITS" ]; then
             echo "needs_backport=true" >> $GITHUB_OUTPUT
+            echo "is_default_store=$([ -n "$DEFAULT_ALIAS" ] && [ "$SOURCE_ALIAS" = "$DEFAULT_ALIAS" ] && echo true || echo false)" >> $GITHUB_OUTPUT
             echo "Commits to sync to main:"
             echo "$COMMITS"
           else
@@ -83,6 +116,7 @@ jobs:
         if: steps.check.outputs.needs_backport == 'true'
         run: |
           SOURCE="${{ steps.ref.outputs.branch }}"
+          IS_DEFAULT="${{ steps.check.outputs.is_default_store }}"
 
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -90,6 +124,18 @@ jobs:
           git fetch origin
           git checkout main
           git merge origin/$SOURCE --no-ff -m "Merge $SOURCE into main [hotfix-backport]"
+
+          # Non-default store: do not bring root sync files to main (avoid conflicts).
+          # Keep only stores/<alias>/ and shared code; restore config/, templates/, sections/ from main.
+          if [ "$IS_DEFAULT" != "true" ]; then
+            git checkout origin/main -- config/ templates/ sections/ 2>/dev/null || true
+            git checkout HEAD -- config/settings_schema.json 2>/dev/null || true
+            if ! git diff --cached --quiet || ! git diff --quiet; then
+              git add config/ templates/ sections/
+              git commit -m "chore: keep root sync files from main for non-default store backport [hotfix-backport]"
+            fi
+          fi
+
           git push origin main
 
           echo "Synced $SOURCE → main"