@slamb2k/mad-skills 2.0.30 → 2.0.32

package/.claude-plugin/plugin.json

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

package/agents/ship-analyzer.md

@@ -11,6 +11,21 @@ model: sonnet
 
 You are a senior engineer responsible for crafting high-quality git commits and pull requests. You read and understand code — not just diffs — to produce meaningful, accurate descriptions of what changed and why.
 
+## CRITICAL: Platform Awareness
+
+Your prompt will include a `PLATFORM` variable (`github` or `azdo`). You MUST
+use this to choose the correct CLI tool for PR creation:
+
+- **`PLATFORM: github`** → use `gh pr create`
+- **`PLATFORM: azdo`** → use `az repos pr create` (NEVER use `gh` — it will fail)
+
+If no PLATFORM variable is provided, detect it yourself from the remote URL:
+- `github.com` → github
+- `dev.azure.com` or `visualstudio.com` → azdo
+
+**NEVER try `gh` commands on an Azure DevOps repository.** The `gh` CLI only
+works with GitHub. Azure DevOps requires `az repos` / `az pipelines` commands.
+
 ## Core Principles
 
 1. **Read before writing** — Always read the actual diff AND relevant source files before composing commit messages. Never guess at intent from filenames alone.
@@ -74,11 +89,11 @@ When given a set of files to ship:
 4. **Push**
    - `git push -u origin <branch>`
 
-5. **Create PR**
+5. **Create PR** (use the PLATFORM variable — do NOT guess)
    - Read the full diff against main to write the PR description
-   - Detect platform from remote URL (github.com → GitHub, dev.azure.com/visualstudio.com → Azure DevOps)
-   - GitHub: Use `gh pr create` with HEREDOC body
-   - Azure DevOps: Use `az repos pr create --title "..." --description "..." --source-branch <branch> --target-branch <default> --output json`
+   - **If PLATFORM == github:** Use `gh pr create` with HEREDOC body
+   - **If PLATFORM == azdo:** Use `az repos pr create --title "..." --description "..." --source-branch <branch> --target-branch <default> --output json`
+   - **NEVER try `gh` on an Azure DevOps repo** — it will fail with "none of the git remotes configured for this repository point to a known GitHub host"
 
 6. **Report results** in the structured format requested by the caller
 

package/package.json

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

package/skills/manifest.json

@@ -1,5 +1,5 @@
 {
-  "generated": "2026-03-12T17:16:55.117Z",
+  "generated": "2026-03-13T06:55:42.461Z",
   "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": 356,
+      "lines": 383,
       "hasScripts": false,
       "hasReferences": true,
       "hasAssets": false,

package/skills/ship/SKILL.md

@@ -91,6 +91,15 @@ fi
 Pass `{PLATFORM}` into all stage prompts. Each stage uses the appropriate
 CLI tool: `gh` for GitHub, `az repos`/`az pipelines` for Azure DevOps.
 
+**Display the detected platform to the user immediately after detection:**
+```
+⚙️ Platform: GitHub (github.com)
+```
+or:
+```
+⚙️ Platform: Azure DevOps ({AZDO_ORG}/{AZDO_PROJECT})
+```
+
 ---
 
 ## Pre-flight
@@ -259,15 +268,21 @@ suggest the manual PR creation command. Do NOT revert the push.
 
 ---
 
-## Stage 3: Wait for CI
+## Stage 3 + 4: CI Watch & Fix Loop
+
+Run CI monitoring in the **foreground** so failures are caught and fixed
+immediately. This stage loops: watch → detect failure → fix → push → watch again.
+
+**Maximum 2 fix attempts.** If CI still fails after 2 rounds, report to user and stop.
+
+### Watch
 
-Launch **Bash subagent** in the **background** (haiku — just polling):
+Launch **Bash subagent** (haiku — polling):
 
 ```
 Task(
   subagent_type: "Bash",
   model: "haiku",
-  run_in_background: true,
   description: "Monitor CI checks",
   prompt: <read from references/stage-prompts.md#stage-3>
 )
@@ -276,18 +291,14 @@ Task(
 Substitute `{PR_NUMBER}`, `{BRANCH}`, `{PLATFORM}`, `{AZDO_MODE}`,
 `{AZDO_ORG}`, `{AZDO_ORG_URL}`, `{AZDO_PROJECT}`, `{PAT}` into the prompt.
 
-While CI runs in the background, briefly inform the user:
-```
-CI running for PR #{pr_number}... waiting for checks.
-```
+Briefly inform the user: `⏳ Watching CI for PR #{pr_number}...`
 
-When the background task completes, read the output file and parse CHECKS_REPORT.
-
----
+Parse CHECKS_REPORT when the subagent returns.
 
-## Stage 4: Fix Failing Checks (if needed)
+### Fix (if needed)
 
-If CHECKS_REPORT shows failures, launch **general-purpose subagent**:
+If CHECKS_REPORT shows `some_failed`, **immediately** launch a fix subagent —
+do not wait, do not ask the user:
 
 ```
 Task(
@@ -300,8 +311,24 @@ Task(
 Substitute `{PR_NUMBER}`, `{BRANCH}`, `{FAILING_CHECKS}`, `{PLATFORM}`,
 `{AZDO_MODE}`, `{AZDO_ORG}`, `{AZDO_ORG_URL}`, `{AZDO_PROJECT}`, `{PAT}` into the prompt.
 
-If fixed, return to Stage 3 (run CI watch again).
-If unable to fix after 2 attempts, report to user and stop.
+The fix subagent MUST commit and push before returning. Once it returns,
+**immediately loop back to Watch** to re-check CI.
+
+### Loop summary
+
+```
+attempt = 0
+while attempt < 2:
+  CHECKS = run_watch()
+  if CHECKS.status == "all_passed" or CHECKS.status == "no_checks":
+    break  → proceed to Stage 5
+  attempt += 1
+  run_fix(CHECKS.failing_checks)
+  → loop back to watch
+
+if attempt == 2 and still failing:
+  report failures to user, stop
+```
 
 ---
 

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

@@ -19,7 +19,11 @@ push to a feature branch, and create a pull request.
 
 Limit SHIP_REPORT to 15 lines maximum.
 
+CRITICAL — READ THIS FIRST:
 PLATFORM: {PLATFORM}
+Use ONLY the tools for this platform. GitHub = gh CLI. Azure DevOps = az repos CLI.
+NEVER use gh commands on an Azure DevOps repository — they WILL fail.
+
 USER INTENT: {USER_INTENT}
 
 FILES TO INCLUDE: {FILES_TO_INCLUDE}
@@ -147,7 +151,8 @@ SHIP_REPORT:
 **Agent:** Bash (haiku, background)
 
 ```
-Monitor PR/pipeline status checks until complete.
+Monitor PR/pipeline status checks until complete. Fail fast — stop polling the
+moment any check fails so fixes can start immediately.
 
 Limit CHECKS_REPORT to 10 lines maximum.
 
@@ -159,8 +164,8 @@ BRANCH: {BRANCH}
 
 **If PLATFORM == github:**
 
-1. **Wait for checks to complete**
-   gh pr checks {PR_NUMBER} --watch
+1. **Wait for checks — fail fast on first failure**
+   gh pr checks {PR_NUMBER} --watch --fail-fast
 
 2. **Report final status**
    gh pr checks {PR_NUMBER}
@@ -190,9 +195,9 @@ BRANCH: {BRANCH}
    ```
    If no policies exist either, report `no_checks`.
 
-2. **Wait for runs to complete — with fail-fast** (max 30 minutes, check every 30s)
+2. **Wait for runs to complete — with fail-fast** (max 30 minutes, check every 15s)
    ```
-   for i in $(seq 1 60); do
+   for i in $(seq 1 120); do
      # Check for failures FIRST — stop immediately if any run has failed
      FAILED=$(az pipelines runs list --branch "$BRANCH" --top 5 \
        --org "{AZDO_ORG_URL}" --project "{AZDO_PROJECT}" \
@@ -207,7 +212,7 @@ BRANCH: {BRANCH}
        --org "{AZDO_ORG_URL}" --project "{AZDO_PROJECT}" \
        --query "[?status=='inProgress'] | length(@)" -o tsv 2>/dev/null)
      if [ "$IN_PROGRESS" = "0" ] || [ -z "$IN_PROGRESS" ]; then break; fi
-     sleep 30
+     sleep 15
    done
    ```
 
@@ -259,9 +264,9 @@ BRANCH: {BRANCH}
    ```
    If no evaluations exist either, report `no_checks`.
 
-2. **Wait for runs to complete — with fail-fast** (max 30 minutes, check every 30s)
+2. **Wait for runs to complete — with fail-fast** (max 30 minutes, check every 15s)
    ```
-   for i in $(seq 1 60); do
+   for i in $(seq 1 120); do
      BUILDS_JSON=$(curl -s -H "$AUTH" "$BUILDS_URL")
 
      # Check for failures FIRST
@@ -274,7 +279,7 @@ BRANCH: {BRANCH}
      # Check if anything still running
      IN_PROGRESS=$(echo "$BUILDS_JSON" | jq '[.value[] | select(.status=="inProgress")] | length')
      if [ "$IN_PROGRESS" = "0" ]; then break; fi
-     sleep 30
+     sleep 15
    done
    ```