Merge pull request #549 from contentstack/fix/add-back-merge-workflow

Fix/add back merge workflow

Author: harshitha-cstk

.cursor/rules/README.md

@@ -1,49 +1,5 @@
-# Cursor Rules Documentation
+# Cursor (optional)
 
-This directory contains **Cursor AI rules** that provide context-aware guidance for the **Contentstack Management JavaScript SDK** (`@contentstack/management`) — CMA client development, not a separate CLI repo.
+**Cursor** users: start at **[`AGENTS.md`](../../AGENTS.md)**. All conventions live in **`skills/*/SKILL.md`**.
 
-## Rules overview
-
-| Rule | Role |
-|------|------|
-| [`dev-workflow.md`](dev-workflow.md) | Branches, lint/tests before PR (unit + optional sanity), version bump guidance, links to skills |
-| [`javascript.mdc`](javascript.mdc) | JavaScript / TypeScript declaration style: `lib/`, `webpack/`, `types/`, root `*.mjs` |
-| [`contentstack-javascript-cma.mdc`](contentstack-javascript-cma.mdc) | CMA SDK patterns in `lib/`: client, stack, auth, host/region, HTTP/error handling |
-| [`testing.mdc`](testing.mdc) | Mocha unit suite, sanity/API tests, Jest + `test/typescript`; env and mocks |
-| [`code-review.mdc`](code-review.mdc) | PR checklist: JSDoc, compat, errors, SCA, unit + sanity tests, CMA semantics (**always applied**) |
-
-## Rule application
-
-Rules load from **globs** and **`alwaysApply`** in each file’s frontmatter (not every rule runs for every file).
-
-| Context | Typical rules |
-|---------|----------------|
-| **Every chat / session** | [`code-review.mdc`](code-review.mdc) (`alwaysApply: true`) |
-| **Most project files** | [`dev-workflow.md`](dev-workflow.md) — `**/*.js`, `**/*.ts`, `**/*.json`, `**/*.mjs` |
-| **SDK implementation** | [`javascript.mdc`](javascript.mdc) + [`contentstack-javascript-cma.mdc`](contentstack-javascript-cma.mdc) for `lib/**/*.js` |
-| **Build config** | [`javascript.mdc`](javascript.mdc) for `webpack/**/*.js` |
-| **Public types** | [`javascript.mdc`](javascript.mdc) for `types/**` |
-| **Tests** | [`testing.mdc`](testing.mdc) for `test/unit/**`, `test/sanity-check/**`, `test/typescript/**`, `test/**/index.js` |
-
-Overlaps are expected (e.g. editing `lib/foo.js` can match `dev-workflow`, `javascript`, and `contentstack-javascript-cma`).
-
-## Usage
-
-- Rules are **loaded automatically** when opened files match their globs (and `code-review` is always in context).
-- You can **@ mention** rule files in chat when your Cursor build supports file references, e.g. `@dev-workflow`, `@javascript`, `@contentstack-javascript-cma`, `@testing`, `@code-review` (exact names depend on how Cursor labels `.md` / `.mdc` rules in your project).
-
-## Quick reference table
-
-| File | `alwaysApply` | Globs (summary) |
-|------|---------------|-----------------|
-| `dev-workflow.md` | no | `**/*.js`, `**/*.ts`, `**/*.json`, `**/*.mjs` |
-| `javascript.mdc` | no | `lib/**/*.js`, `webpack/**/*.js`, `types/**/*.ts`, `types/**/*.d.ts`, `*.mjs` |
-| `contentstack-javascript-cma.mdc` | no | `lib/**/*.js` |
-| `testing.mdc` | no | `test/unit/**`, `test/sanity-check/**`, `test/typescript/**`, `test/**/index.js` |
-| `code-review.mdc` | **yes** | — |
-
-## Skills & maintenance
-
-- Deeper playbooks: [`skills/README.md`](../../skills/README.md).
-- Repo agent entry: [`AGENTS.md`](../../AGENTS.md).
-- When directories change, update **globs** in rule frontmatter; keep rules short and put detail in `skills/*/SKILL.md`.
+This file is the only artifact under **`.cursor/rules/`** in this repo — no duplicate rules; **`AGENTS.md`** and **`skills/`** are canonical.

.cursor/rules/code-review.mdc

@@ -0,0 +1,63 @@
+# Opens a PR from master → development after changes land on master (back-merge).
+#
+# Permissions: default GITHUB_TOKEN needs repo Settings → Actions → General →
+# "Workflow permissions" = read and write (to create pull requests). If your org
+# restricts this, create a fine-grained PAT with contents:read + pull-requests:write,
+# store it as repo secret GH_TOKEN, and set GH_TOKEN on the "Open back-merge PR" step to:
+#   env:
+#     GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
+name: Back-merge master to development
+
+on:
+  push:
+    branches: [master]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  open-back-merge-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Open back-merge PR if needed
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          git fetch origin development master
+
+          MASTER_SHA=$(git rev-parse origin/master)
+          DEV_SHA=$(git rev-parse origin/development)
+
+          if [ "$MASTER_SHA" = "$DEV_SHA" ]; then
+            echo "master and development are at the same commit; nothing to back-merge."
+            exit 0
+          fi
+
+          EXISTING=$(gh pr list --repo "${{ github.repository }}" \
+            --base development \
+            --head master \
+            --state open \
+            --json number \
+            --jq 'length')
+
+          if [ "$EXISTING" -gt 0 ]; then
+            echo "An open PR from master to development already exists; skipping."
+            exit 0
+          fi
+
+          gh pr create --repo "${{ github.repository }}" \
+            --base development \
+            --head master \
+            --title "chore: back-merge master into development" \
+            --body "Automated back-merge after changes landed on \`master\`. Review and merge to keep \`development\` in sync."
+
+          echo "Created back-merge PR master → development."

.cursor/rules/contentstack-javascript-cma.mdc

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Comment PR
-        if: github.base_ref == 'master' && github.head_ref != 'developement'
+        if: github.base_ref == 'master' && github.head_ref != 'development'
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |