climaybe 1.8.1 → 1.8.2

package/README.md

@@ -225,6 +225,7 @@ Enabled via `climaybe init` prompt (`Enable build + Lighthouse workflows?`; defa
 - **Non-staging to main** (hotfix backports, direct commits): **Patch** bump only, via **nightly workflow** at 02:00 US Eastern (not at commit time).
 - **Version bump runs only on main** (post-merge-tag and nightly-hotfix). Main-to-staging-stores merges main into each `staging-<alias>` on every push (version bumps and hotfixes). When the push is a hotfix from one store (e.g. live-norway), that store’s staging branch is skipped; other stores’ staging branches still get the merge.
 - Version bumps update `config/settings_schema.json` and, when present, `package.json` `version`.
+- **Safety**: The version-bump workflow fails if the new tag would not be **strictly higher** than the latest merged release tag (semver), so the release line cannot step backward.
 
 **Full specification:** For detailed versioning rules, local dev flow, hotfix behavior, and alignment with the external CI/CD doc, see **[CI/CD Reference](docs/CI_CD_REFERENCE.md)**.
 

package/bin/version.txt

@@ -1 +1 @@
-1.8.1
+1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "1.8.1",
+  "version": "1.8.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/cursor/skills/changelog-release/SKILL.md

@@ -18,7 +18,7 @@ Use the same type labels and emoji for changelog sections so the output matches
 
 ## Workflow
 
-1. **Determine range** — Since last tag (e.g. `git describe --tags --abbrev=0` then `git log TAG..HEAD`), or since a branch/commit the user specifies. If unclear, default to "since last tag".
+1. **Determine range** — Since last tag: use the **highest semver** among tags merged into `HEAD` (merged-into + `sort -V`), then `git log TAG..HEAD`. Do not rely on `git describe` alone after branch merges—it can return a **lower** version that is graph-closer on the merged branch. Or use a branch/commit the user specifies. If unclear, default to "since last tag".
 2. **Get commits** — Run `git log --oneline [range]` (or with `--pretty=format:...` for message + body). Parse commit messages.
 3. **Group by type** — Map each commit to a type from commit-rules.mdc (fix, feat, refactor, style, remove, wip, docs, ai, chore, upgrade). Ignore merge commits. Put "unknown" or "other" for non-matching messages.
 4. **Format** — Output markdown:

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

@@ -61,9 +61,15 @@ jobs:
             fi
             NEW_VERSION="v${NEW_VERSION}"
           else
-            # Get latest tag (or theme_version from settings_schema.json when no tags)
-            LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+            # Highest semver among tags reachable from HEAD — not `git describe`, which picks
+            # the graph-nearest tag and can choose an old tag on the merged branch after staging→main.
+            LATEST_TAG=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+            # Legacy tags without patch (v1.0) if no strict triple match
             if [ -z "$LATEST_TAG" ]; then
+              LATEST_TAG=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+$' | sort -V | tail -1)
+            fi
+            if [ -z "$LATEST_TAG" ]; then
+              # No semver tags: theme_version from settings_schema.json, else v0.0.0
               SCHEMA="config/settings_schema.json"
               if [ -f "$SCHEMA" ]; then
                 LATEST_TAG=$(node -e "
@@ -100,6 +106,26 @@ jobs:
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
           echo "New version: $NEW_VERSION"
 
+      - name: Refuse non-increasing version
+        env:
+          NEW_VERSION: ${{ steps.bump.outputs.new_version }}
+        run: |
+          git fetch --tags origin
+          MAX_EXISTING=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          if [ -z "$MAX_EXISTING" ]; then
+            MAX_EXISTING=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          fi
+          if [ -z "$MAX_EXISTING" ]; then
+            echo "No merged semver tags; skipping monotonic check."
+            exit 0
+          fi
+          HI=$(printf '%s\n' "$MAX_EXISTING" "$NEW_VERSION" | sort -V | tail -1)
+          if [ "$HI" != "$NEW_VERSION" ] || [ "$NEW_VERSION" = "$MAX_EXISTING" ]; then
+            echo "::error::Refusing to release ${NEW_VERSION}: latest merged tag is ${MAX_EXISTING}; new tag must be strictly higher (semver)."
+            exit 1
+          fi
+          echo "OK: ${NEW_VERSION} > ${MAX_EXISTING}"
+
       - name: Update settings_schema.json and package.json
         env:
           NEW_VERSION: ${{ steps.bump.outputs.new_version }}

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

@@ -42,7 +42,10 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+          LATEST_TAG=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          if [ -z "$LATEST_TAG" ]; then
+            LATEST_TAG=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          fi
           if [ -z "$LATEST_TAG" ]; then
             SCHEMA="config/settings_schema.json"
             if [ -f "$SCHEMA" ]; then

package/src/workflows/single/post-merge-tag.yml

@@ -77,7 +77,10 @@ jobs:
       - name: Get latest tag (or create from settings_schema.json)
         id: tag
         run: |
-          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+          LAST_TAG=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          if [ -z "$LAST_TAG" ]; then
+            LAST_TAG=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          fi
           if [ -z "$LAST_TAG" ]; then
             SCHEMA="config/settings_schema.json"
             if [ -f "$SCHEMA" ]; then

package/src/workflows/single/release-pr-check.yml

@@ -56,7 +56,10 @@ jobs:
       - name: Create pre-release patch tag
         id: tag
         run: |
-          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+          LATEST_TAG=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          if [ -z "$LATEST_TAG" ]; then
+            LATEST_TAG=$(git tag --merged HEAD | grep -E '^v[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          fi
           if [ -z "$LATEST_TAG" ]; then
             # No tags: use theme_version from config/settings_schema.json and push as initial tag
             SCHEMA="config/settings_schema.json"