@codedrifters/configulator 0.0.170 → 0.0.172

package/lib/index.js

@@ -643,7 +643,7 @@ var baseBundle = {
     },
     {
       name: "branch-naming-conventions",
-      description: "Branch format (type/[issue-]description), create-on-GitHub-then-fetch workflow",
+      description: "Branch format (type/issue-description), create-on-GitHub-then-fetch workflow",
       scope: AGENT_RULE_SCOPE.ALWAYS,
       content: [
         "# Branch Naming Conventions",
@@ -651,19 +651,19 @@ var baseBundle = {
         "## Format",
         "",
         "```",
-        "<type>/[<issue>-]<description>",
+        "<type>/<issue-number>-<issue-slug>",
         "```",
         "",
         "- **type** (required): One of `feat`, `fix`, `docs`, `chore`, `refactor`, `release`, `hotfix`",
-        "- **issue** (optional): Issue number (e.g., `25`). Include when known.",
-        "- **description** (required): Short, lowercase, kebab-case summary",
+        "- **issue-number** (required): The GitHub issue number (e.g., `25`)",
+        "- **issue-slug** (required): Short, lowercase, kebab-case summary derived from the issue title",
         "",
         "## Examples",
         "",
         "- `feat/25-add-cursor-rules`",
         "- `fix/23-rename-cursor-rules-mdc`",
-        "- `chore/upgrade-eslint`",
-        "- `docs/update-readme`"
+        "- `chore/42-upgrade-eslint`",
+        "- `docs/18-update-readme`"
       ].join("\n"),
       tags: ["workflow"]
     },
@@ -742,14 +742,14 @@ var githubWorkflowBundle = {
         "   - `chore:` / `refactor:` \u2192 `chore/`",
         "   - `test:` \u2192 `test/`",
         "   - No prefix \u2192 `feat/`",
-        "4. **Create a branch** following the naming convention: `<type>/<short-slug>-<issue-number>` (e.g., `feat/add-login-42`)",
+        "4. **Create a branch** following the naming convention: `<type>/<issue-number>-<issue-slug>` (e.g., `feat/42-add-login`)",
         "5. **Checkout the branch** locally",
         "6. **Link the branch to the issue** by posting a comment: `gh issue comment <number> --body 'Branch: \\`<branch-name>\\`'`",
-        "7. **Stop and wait** for user instructions \u2014 do **NOT** start implementing",
+        "7. **Create an implementation plan** \u2014 analyze the issue requirements, explore the relevant codebase, and present a plan for the user to approve before starting any implementation",
         "",
         "### Important",
         "",
-        "- Never begin implementation without explicit user direction",
+        "- Never begin implementation without the user approving the plan",
         "- If the issue title has no conventional prefix, default to `feat/`",
         "- Keep the slug short (3-5 words max, kebab-case)"
       ].join("\n"),
@@ -767,17 +767,23 @@ var githubWorkflowBundle = {
         "When the user says **open a PR** (or similar), follow these steps exactly:",
         "",
         "1. **Check for uncommitted changes** \u2014 if any exist, commit them with a conventional commit message",
-        "2. **Push the branch** to origin: `git push -u origin <branch>`",
-        "3. **Create the PR** using `gh pr create`:",
+        "2. **Pull and rebase from the default branch** \u2014 run `git pull origin {{repository.defaultBranch}} --rebase` to incorporate the latest changes and resolve any conflicts before pushing",
+        "3. **Push the branch** to origin: `git push -u origin <branch>`",
+        "4. **Create the PR** using `gh pr create`:",
         "   - **Title**: use a conventional commit style title (e.g., `feat(scope): short description`)",
         "   - **Body**: include `Closes #<issue-number>` (derived from the branch name) and a brief summary of changes",
-        "4. **Display merge dialog text** for the user to copy-paste when merging:",
+        "5. **Enable auto-merge with squash** \u2014 use `gh pr merge --auto --squash` with the merge commit message:",
         "",
         "```",
-        "Commit message:",
-        "<conventional-commit-title>",
+        "gh pr merge --auto --squash --subject '<conventional-commit-title>' --body '<extended-description>'",
+        "```",
+        "",
+        "The merge commit message should follow this format:",
+        "",
+        "```",
+        "Subject: <conventional-commit-title>",
         "",
-        "Extended description:",
+        "Body:",
         "- Bullet points summarizing the changes",
         "- Closes #<issue-number>",
         "```",
@@ -799,9 +805,9 @@ var githubWorkflowBundle = {
         "",
         "### Important",
         "",
-        "- Always derive the issue number from the branch name (e.g., `feat/add-login-42` \u2192 `#42`)",
+        "- Always derive the issue number from the branch name (e.g., `feat/42-add-login` \u2192 `#42`)",
         "- Use conventional commit format for the PR title",
-        "- Do not merge the PR \u2014 only create it and display the merge text"
+        "- Always enable auto-merge with squash \u2014 do not merge manually"
       ].join("\n"),
       tags: ["workflow"]
     }