@rtorcato/repo-tooling 3.10.2 → 3.11.0

package/dist/base/github-settings.js

@@ -115,7 +115,15 @@ async function probeRepo(exec) {
             autoMerge: d.allow_auto_merge === true,
             squashMerge: d.allow_squash_merge === true,
             deleteOnMerge: d.delete_branch_on_merge === true,
-            mergeVisible: ['allow_auto_merge', 'allow_squash_merge', 'delete_branch_on_merge'].every((k) => typeof d[k] === 'boolean'),
+            mergeCommit: d.allow_merge_commit === true,
+            rebaseMerge: d.allow_rebase_merge === true,
+            mergeVisible: [
+                'allow_auto_merge',
+                'allow_squash_merge',
+                'delete_branch_on_merge',
+                'allow_merge_commit',
+                'allow_rebase_merge',
+            ].every((k) => typeof d[k] === 'boolean'),
         },
     };
 }
@@ -197,6 +205,16 @@ async function checkBranchProtection(exec, nwo, branch) {
         };
     return { check, status: 'ok', detail: `${branch} protected per standard` };
 }
+/**
+ * Squash is required *and exclusive* (#410). Leaving merge-commit or rebase
+ * enabled only makes them available on the merge button, and one mis-click puts
+ * every intermediate branch commit on the default branch: semantic-release then
+ * reads subjects nobody reviewed (a stray `fix:` inside a docs PR cuts a
+ * release), and `ai-issue-loop`'s Pass 2 stops finding the `(#N)` squash subject
+ * it uses to confirm work landed, so worktrees leak. Observed on `js-common`
+ * #204, whose CONTRIBUTING already said squash-only — the rule existed, nothing
+ * enforced it.
+ */
 function checkMergeSettings(info) {
     const check = 'Merge settings';
     // The token can't see the merge-setting fields (no admin:read) — skip rather
@@ -210,14 +228,18 @@ function checkMergeSettings(info) {
         deltas.push('squash-merge disabled');
     if (!info.deleteOnMerge)
         deltas.push('delete-branch-on-merge disabled');
+    if (info.mergeCommit)
+        deltas.push('merge commits allowed (squash only)');
+    if (info.rebaseMerge)
+        deltas.push('rebase merging allowed (squash only)');
     if (deltas.length)
         return {
             check,
             status: 'drift',
             detail: deltas.join('; '),
-            hint: 'Enable auto-merge, squash-merge, and delete-branch-on-merge in repo settings',
+            hint: 'Enable auto-merge and delete-branch-on-merge, and make squash the only merge method',
         };
-    return { check, status: 'ok', detail: 'auto-merge, squash-merge, delete-on-merge all on' };
+    return { check, status: 'ok', detail: 'squash-only, auto-merge and delete-on-merge on' };
 }
 async function checkWorkflowPermissions(exec, nwo) {
     const check = 'Workflow permissions';
@@ -370,7 +392,7 @@ export function buildGhApplyCommands(state) {
     const commands = [];
     if (state.merge)
         commands.push({
-            label: 'merge settings (auto-merge, squash, delete-on-merge)',
+            label: 'merge settings (squash-only, auto-merge, delete-on-merge)',
             args: [
                 'api',
                 '-X',
@@ -382,6 +404,10 @@ export function buildGhApplyCommands(state) {
                 'allow_squash_merge=true',
                 '-F',
                 'delete_branch_on_merge=true',
+                '-F',
+                'allow_merge_commit=false',
+                '-F',
+                'allow_rebase_merge=false',
             ],
         });
     if (state.protection)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/repo-tooling",
-	"version": "3.10.2",
+	"version": "3.11.0",
 	"description": "One CLI to scaffold, audit and fix your repo's whole toolchain — linting, tests, commits, releases & CI.",
 	"type": "module",
 	"keywords": [

package/skills/ai-issue-loop/SKILL.md

@@ -806,10 +806,14 @@ times against one trivial issue and watch the labels advance.
 ## Repo prerequisites
 
 ```bash
-gh api repos/$OWNER_REPO --jq '{allow_squash_merge, allow_auto_merge, delete_branch_on_merge}'
+gh api repos/$OWNER_REPO --jq '{allow_squash_merge, allow_merge_commit, allow_rebase_merge, allow_auto_merge, delete_branch_on_merge}'
 gh api repos/$OWNER_REPO/branches/main/protection --jq '{contexts: .required_status_checks.contexts, reviews: .required_pull_request_reviews}'
 ```
 
-Need: squash + auto-merge + delete-on-merge all true, at least one required
-status check, and `required_pull_request_reviews: null`. See the
-`github-pr-workflow` skill for the one-time bootstrap.
+Need: auto-merge + delete-on-merge + squash all true, **`allow_merge_commit` and
+`allow_rebase_merge` both false**, at least one required status check, and
+`required_pull_request_reviews: null`. Squash has to be the *only* method, not
+merely an available one: Pass 2 confirms a PR landed by finding its `(#N)` squash
+subject on `main`, and a merge commit leaves nothing to find — the worktree then
+survives every tick and its `ai-wip` slot leaks. See the `github-pr-workflow`
+skill for the one-time bootstrap.