@slamb2k/mad-skills 2.0.34 → 2.0.35

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "mad-skills",
   "description": "AI-assisted planning, development and governance tools",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "author": {
     "name": "slamb2k",
     "url": "https://github.com/slamb2k"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slamb2k/mad-skills",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Claude Code skills collection — full lifecycle development tools",
   "type": "module",
   "repository": {

package/skills/manifest.json

@@ -1,5 +1,5 @@
 {
-  "generated": "2026-03-13T08:44:12.749Z",
+  "generated": "2026-03-13T08:59:11.298Z",
   "count": 10,
   "skills": [
     {
@@ -76,7 +76,7 @@
       "name": "ship",
       "directory": "ship",
       "description": "\"Ship changes through the full PR lifecycle. Use after completing feature work to commit, push, create PR, wait for checks, and merge. Handles the entire workflow: syncs with main, creates feature branch if needed, groups commits logically with semantic messages, creates detailed PR, monitors CI, fixes issues, squash merges, and cleans up. Invoke when work is ready to ship.\"",
-      "lines": 412,
+      "lines": 422,
       "hasScripts": false,
       "hasReferences": true,
       "hasAssets": false,

package/skills/ship/SKILL.md

@@ -339,13 +339,15 @@ confirmation.** The user invoked `/ship` expecting the full lifecycle; stopping
 to ask defeats the purpose. Squash merge and delete the source branch are the
 defaults (override via `--no-squash` and `--keep-branch` flags only).
 
+### 5a. Merge the PR
+
 Launch **Bash subagent** (haiku — simple git + platform CLI commands):
 
 ```
 Task(
   subagent_type: "Bash",
   model: "haiku",
-  description: "Merge PR and sync",
+  description: "Merge PR",
   prompt: <read from references/stage-prompts.md#stage-5>
 )
 ```
@@ -355,6 +357,14 @@ Substitute `{PR_NUMBER}`, `{REMOTE}`, `{DEFAULT_BRANCH}`, `{PLATFORM}`,
 
 Parse LAND_REPORT.
 
+### 5b. Sync local repo
+
+After the merge subagent succeeds, invoke `/sync` from the orchestrator to
+checkout the default branch, pull the merge commit, and **clean up stale
+branches** (prune gone remotes, delete merged branches). This replaces any
+manual `git checkout`/`git pull` — `/sync` handles everything including stash
+restore and branch cleanup.
+
 ---
 
 ## What's Next?

package/skills/ship/references/stage-prompts.md

@@ -367,7 +367,8 @@ FIX_REPORT:
 **Agent:** Bash (haiku)
 
 ```
-Merge the pull request and sync local {DEFAULT_BRANCH}.
+Merge the pull request. Do NOT sync locally — the orchestrator handles that
+via /sync after this subagent returns.
 Do NOT ask the user for confirmation — proceed immediately.
 
 Limit LAND_REPORT to 10 lines maximum.
@@ -458,12 +459,7 @@ BRANCH_FLAGS: {--delete-branch (default) | omit if --keep-branch}
        "$PR_API?api-version=7.0" \
        -d "{\"status\": \"completed\", \"completionOptions\": {\"mergeStrategy\": \"$MERGE_STRATEGY\", \"deleteSourceBranch\": $DELETE_BRANCH}}"
 
-2. **Sync local repository**
-   Invoke `/sync` to checkout {DEFAULT_BRANCH}, pull latest changes, restore
-   any stashed work, and clean up merged branches. This replaces manual git
-   checkout/pull/fetch/prune — /sync handles all of it including stash restore.
-
-3. **Report**
+2. **Report**
    MERGE_COMMIT=$(git rev-parse --short HEAD)
 
 ## Output Format
@@ -473,6 +469,5 @@ LAND_REPORT:
 - merge_commit: {hash}
 - merge_type: squash|merge
 - branch_deleted: true|false
-- branches_cleaned: {list or "none"}
 - errors: {any errors}
 ```