chore: sync next-feat with main

.githooks/pre-push

@@ -18,14 +18,27 @@ cd "$repo_root"
 # and it is not a valid PR head (see git.md "PR head branch name convention").
 # stdin is the pre-push protocol: `<local_ref> <local_sha> <remote_ref> <remote_sha>` lines.
 LOCAL_PUSH_ATTEMPTED=0
+HAS_REAL_PUSH=0
 LOCAL_STDIN=""
 while IFS= read -r line; do
   LOCAL_STDIN="${LOCAL_STDIN}${line}
 "
   # shellcheck disable=SC2086
   set -- $line
   local_ref="${1:-}"
+  local_sha="${2:-}"
   remote_ref="${3:-}"
+  remote_sha="${4:-}"
+
+  # Skip branch deletions with `continue` (skip THIS ref only). `exit 0` here would
+  # abort the whole hook on the first delete ref, bypassing the 'local'-guard for any
+  # non-delete ref in the same push (a mixed delete + 'local' update). Heavy CI is still
+  # skipped for a delete-only push via the HAS_REAL_PUSH check after the loop.
+  if [ "$local_sha" = "0000000000000000000000000000000000000000" ] || [ "$local_sha" = "(delete)" ]; then
+    continue
+  fi
+  HAS_REAL_PUSH=1
+
   if [ "$local_ref" = "refs/heads/local" ] || [ "$remote_ref" = "refs/heads/local" ]; then
     LOCAL_PUSH_ATTEMPTED=1
   fi
@@ -52,6 +65,11 @@ fi
 # contract for future hook chaining.)
 printf '%s' "$LOCAL_STDIN"
 
+# Delete-only push (every ref was a deletion): nothing to test — skip heavy CI.
+if [ "$HAS_REAL_PUSH" = "0" ]; then
+  exit 0
+fi
+
 echo "Running pre-push checks (CI parity)..."
 
 if ! command -v bats >/dev/null 2>&1; then

.github/workflows/auto-ready.yml

@@ -1,15 +1,27 @@
 name: auto-ready
 
-# Automatically converts draft PRs targeting next-feat / next-fix to ready_for_review
-# once required checks (branch-tag-adjudication, Test) pass.
+# Converts draft PRs *targeting* next-feat / next-fix to ready_for_review once
+# branch-tag-adjudication passes.
+#
+# The `branches:` filter of a workflow_run trigger matches the HEAD branch of
+# the run that fired, not the base of its PR. A PR into next-feat/next-fix runs
+# its checks on the feature branch (fix/…, feat/…), so filtering on
+# [next-feat, next-fix] never matched the PRs this workflow exists to serve —
+# it only matched promotion PRs (head next-*, base main), which are exactly the
+# ones it should leave alone. Every historical run of this workflow was such a
+# misfire.
+#
+# So: no branch filter, and the base is checked in the job instead. The
+# workflow_run payload does carry it — pull_requests[0].base.ref.
+#
+# Note `Test` is deliberately not listed: it triggers on `pull_request:
+# branches: [main]`, so it never runs for a PR into next-feat/next-fix and
+# waiting on it here would be waiting on something that cannot arrive.
 
 on:
   workflow_run:
-    workflows: ["branch-tag-adjudication", "Test"]
+    workflows: ["branch-tag-adjudication"]
     types: [completed]
-    branches:
-      - next-feat
-      - next-fix
 
 permissions:
   pull-requests: write
@@ -25,18 +37,38 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}
           PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
+          BASE_REF: ${{ github.event.workflow_run.pull_requests[0].base.ref }}
         run: |
           set -euo pipefail
           if [ -z "$PR_NUMBER" ]; then
             echo "No associated PR found in workflow_run event — skipping."
             exit 0
           fi
 
+          case "$BASE_REF" in
+            next-feat|next-fix) ;;
+            *)
+              echo "PR #$PR_NUMBER targets '${BASE_REF:-<unknown>}', not a staging branch — skipping."
+              exit 0
+              ;;
+          esac
+
           IS_DRAFT=$(gh pr view "$PR_NUMBER" -R "$REPO" --json isDraft --jq '.isDraft')
-          if [ "$IS_DRAFT" = "true" ]; then
-            echo "PR #$PR_NUMBER is draft. Converting to ready for review..."
-            gh pr ready "$PR_NUMBER" -R "$REPO"
+          if [ "$IS_DRAFT" != "true" ]; then
+            echo "PR #$PR_NUMBER is already ready for review or not draft."
+            exit 0
+          fi
+
+          echo "PR #$PR_NUMBER (base $BASE_REF) is draft. Converting to ready for review..."
+          # GITHUB_TOKEN cannot perform markPullRequestReadyForReview even with
+          # pull-requests: write — it fails with "Resource not accessible by
+          # integration". Report that plainly instead of failing the run: a red
+          # X here would say "the checks failed", which is not what happened.
+          # Until a token that can do it is wired up, the transition is the
+          # author's to make (github-flow's publish topic runs `gh pr ready`).
+          if gh pr ready "$PR_NUMBER" -R "$REPO" 2>/tmp/ready.err; then
             echo "Successfully converted PR #$PR_NUMBER to ready_for_review."
           else
-            echo "PR #$PR_NUMBER is already ready for review or not draft."
+            echo "::warning::Could not convert PR #$PR_NUMBER to ready — $(cat /tmp/ready.err)"
+            echo "GITHUB_TOKEN lacks markPullRequestReadyForReview. Convert manually or wire a token that can."
           fi

.github/workflows/branch-tag-adjudication.yml

@@ -10,6 +10,9 @@ name: branch-tag-adjudication
 #   earlier PR, possibly not yet cascaded to main).
 # - next-fix: fix commits allowed. chore commits allowed ONLY when the same PR
 #   also contains a fix commit touching the same skill. feat is always REJECTED.
+# - refactor: allowed as a primary tag on BOTH branches. A refactor is a
+#   behaviour-preserving restructure (e.g. a skill rename) that drives no
+#   release bump, so it needs no same-skill feat/fix rider context.
 # - Any commit touching skills/**/*.md with tag chore or docs is REJECTED —
 #   skill md changes must use fix: (or feat: when accompanied by a new topic
 #   file). Skill md = behaviour surface, not documentation.
@@ -186,6 +189,10 @@ jobs:
                   feat)
                     # Always OK — this is the intended tag for this branch.
                     ;;
+                  refactor)
+                    # Behaviour-preserving restructure — allowed as a primary
+                    # tag on both staging branches (drives no release bump).
+                    ;;
                   fix|chore)
                     # Allowed when the same PR contains a feat commit for the
                     # same skill (i.e. we are shipping a topic addition and a
@@ -199,7 +206,7 @@ jobs:
                     fi
                     ;;
                   *)
-                    echo "::error::next-feat branch: unsupported tag '$TAG' on commit $SHA (skill=$SKILL). Allowed tags: feat (primary), fix/chore (as rider when feat present)."
+                    echo "::error::next-feat branch: unsupported tag '$TAG' on commit $SHA (skill=$SKILL). Allowed tags: feat (primary), refactor, fix/chore (as rider when feat present)."
                     FAIL=1
                     ;;
                 esac
@@ -209,6 +216,10 @@ jobs:
                   fix)
                     # Always OK.
                     ;;
+                  refactor)
+                    # Behaviour-preserving restructure — allowed as a primary
+                    # tag on both staging branches (drives no release bump).
+                    ;;
                   chore)
                     if [ "${PR_SKILL_HAS[${SKILL}__fix]:-0}" != "1" ]; then
                       echo "::error::next-fix branch: commit $SHA (skill=$SKILL, tag=$TAG) rejected. Same-skill fix commit not present in this PR."
@@ -220,7 +231,7 @@ jobs:
                     FAIL=1
                     ;;
                   *)
-                    echo "::error::next-fix branch: unsupported tag '$TAG' on commit $SHA (skill=$SKILL). Allowed tags: fix (primary), chore (as rider when fix present)."
+                    echo "::error::next-fix branch: unsupported tag '$TAG' on commit $SHA (skill=$SKILL). Allowed tags: fix (primary), refactor, chore (as rider when fix present)."
                     FAIL=1
                     ;;
                 esac
@@ -236,6 +247,7 @@ jobs:
           ::error::One or more commits violate the staging-branch tag policy.
           Policy summary: next-feat accepts feat (fix/chore only as same-skill riders);
           next-fix accepts fix (chore only as a same-skill rider; feat never);
+          refactor is accepted as a primary tag on both branches;
           skill md changes must be tagged fix: or feat: on either branch.
           EOF
             exit 1

.github/workflows/test.yml

@@ -59,3 +59,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: bash scripts/lint-frontmatter.sh
+
+  hooks-json-lint:
+    name: Verify hooks.json (no duplicates, no ghost paths)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - run: python3 scripts/verify-hooks-json.py

.release-please-manifest.json

@@ -1,26 +1,26 @@
 {
-  "skills/cc-plugin": "0.5.3",
+  "skills/cc-plugin": "0.6.0",
   "skills/chezmoi": "0.4.2",
   "skills/choco": "1.0.4",
-  "skills/claude-session": "0.8.1",
-  "skills/claudify": "0.6.1",
-  "skills/code-workflow": "0.6.3",
-  "skills/commit-tidy": "0.5.4",
-  "skills/consolidate": "0.5.4",
-  "skills/dotfile": "0.5.1",
-  "skills/fix": "0.3.12",
-  "skills/fix-plan": "0.8.0",
+  "skills/claudify": "0.7.0",
+  "skills/code-workflow": "0.7.0",
+  "skills/commit-tidy": "0.5.5",
+  "skills/consolidate": "0.6.0",
+  "skills/dotfile": "0.6.0",
+  "skills/fix": "0.4.0",
+  "skills/fix-plan": "0.9.0",
   "skills/forge": "0.1.2",
-  "skills/git-repo": "0.8.1",
-  "skills/github-flow": "0.8.3",
+  "skills/git-repo": "0.9.0",
+  "skills/github-flow": "0.9.0",
   "skills/harness": "0.1.2",
   "skills/mcp-config": "0.3.2",
-  "skills/next": "0.8.1",
+  "skills/next": "0.9.0",
   "skills/omz": "0.3.2",
   "skills/repo": "0.3.2",
-  "skills/skill-kit": "0.6.3",
+  "skills/session": "0.8.1",
+  "skills/skill-kit": "0.7.0",
   "skills/tdd": "0.3.3",
   "skills/todowrite": "0.8.1",
   "skills/web-browser": "0.2.7",
-  "skills/wip": "0.4.5"
+  "skills/wip": "0.5.0"
 }

hooks/hooks.json

@@ -132,12 +132,20 @@
           {
             "type": "command",
             "command": "bash ${CLAUDE_PLUGIN_ROOT}/skills/consolidate/resources/block-noncompliant-review-comment.sh"
+          },
+          {
+            "type": "command",
+            "command": "bash ${CLAUDE_PLUGIN_ROOT}/skills/consolidate/resources/block-summary-fabricated-claims.sh"
           }
         ]
       },
       {
         "matcher": "Edit",
         "hooks": [
+          {
+            "type": "command",
+            "command": "node ${CLAUDE_PLUGIN_ROOT}/skills/fix-plan/resources/block-direct-checklist-edit.js"
+          },
           {
             "type": "command",
             "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/complex-logic-guard.sh"
@@ -160,7 +168,7 @@
           },
           {
             "type": "command",
-            "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-wip-register-before-execute.sh"
+            "command": "${CLAUDE_PLUGIN_ROOT}/skills/wip/resources/block-wip-register-before-execute.sh"
           },
           {
             "type": "command",
@@ -179,6 +187,10 @@
       {
         "matcher": "Write",
         "hooks": [
+          {
+            "type": "command",
+            "command": "node ${CLAUDE_PLUGIN_ROOT}/skills/fix-plan/resources/block-direct-checklist-edit.js"
+          },
           {
             "type": "command",
             "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/staged-protect.sh"
@@ -193,7 +205,7 @@
           },
           {
             "type": "command",
-            "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-wip-register-before-execute.sh"
+            "command": "${CLAUDE_PLUGIN_ROOT}/skills/wip/resources/block-wip-register-before-execute.sh"
           },
           {
             "type": "command",
@@ -231,7 +243,7 @@
           },
           {
             "type": "command",
-            "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-cleanup-option-below-context-gate.sh",
+            "command": "${CLAUDE_PLUGIN_ROOT}/skills/cleanup/resources/block-cleanup-option-below-context-gate.sh",
             "timeout": 10
           },
           {
@@ -242,6 +254,11 @@
           {
             "type": "command",
             "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-ask-without-token-measure.sh"
+          },
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-squash-recommend-multi-commit.sh",
+            "timeout": 15
           }
         ]
       },
@@ -312,11 +329,11 @@
           },
           {
             "type": "command",
-            "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-cleanup-without-rag.sh"
+            "command": "${CLAUDE_PLUGIN_ROOT}/skills/cleanup/resources/block-cleanup-without-rag.sh"
           },
           {
             "type": "command",
-            "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-cleanup-without-claudify.sh"
+            "command": "${CLAUDE_PLUGIN_ROOT}/skills/cleanup/resources/block-cleanup-without-claudify.sh"
           },
           {
             "type": "command",
@@ -341,7 +358,7 @@
           },
           {
             "type": "command",
-            "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-cleanup-missing-rename.sh"
+            "command": "${CLAUDE_PLUGIN_ROOT}/skills/cleanup/resources/block-cleanup-missing-rename.sh"
           }
         ]
       }

release-please-config.json

@@ -82,16 +82,6 @@
         }
       ]
     },
-    "skills/claude-session": {
-      "package-name": "claude-session",
-      "component": "claude-session",
-      "extra-files": [
-        {
-          "type": "generic",
-          "path": "SKILL.md"
-        }
-      ]
-    },
     "skills/claudify": {
       "package-name": "claudify",
       "component": "claudify",
@@ -242,6 +232,16 @@
         }
       ]
     },
+    "skills/session": {
+      "package-name": "session",
+      "component": "session",
+      "extra-files": [
+        {
+          "type": "generic",
+          "path": "SKILL.md"
+        }
+      ]
+    },
     "skills/skill-kit": {
       "package-name": "skill-kit",
       "component": "skill-kit",