@slamb2k/mad-skills 2.0.34 → 2.0.36

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.36",
   "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.36",
   "description": "Claude Code skills collection — full lifecycle development tools",
   "type": "module",
   "repository": {

package/skills/brace/SKILL.md

@@ -329,6 +329,10 @@ elif echo "$REMOTE_URL" | grep -q 'visualstudio\.com'; then
   AZDO_PROJECT=$(echo "$REMOTE_URL" | sed -n 's|.*/\([^/]*\)/_git/.*|\1|p')
   AZDO_ORG_URL="https://dev.azure.com/$AZDO_ORG"
 fi
+# URL-decode for CLI/display; keep URL-safe versions for REST API paths
+AZDO_PROJECT_URL_SAFE="$AZDO_PROJECT"
+AZDO_ORG=$(printf '%b' "${AZDO_ORG//%/\\x}")
+AZDO_PROJECT=$(printf '%b' "${AZDO_PROJECT//%/\\x}")
 REPO_NAME=$(basename -s .git "$REMOTE_URL")
 ```
 
@@ -350,11 +354,11 @@ If org/project extraction fails, report ⚠️ and skip branch policies.
    AUTH="Authorization: Basic $(echo -n ":$PAT" | base64)"
    # Get repository ID first
    REPO_ID=$(curl -s -H "$AUTH" \
-     "$AZDO_ORG_URL/$AZDO_PROJECT/_apis/git/repositories/$REPO_NAME?api-version=7.0" \
+     "$AZDO_ORG_URL/$AZDO_PROJECT_URL_SAFE/_apis/git/repositories/$REPO_NAME?api-version=7.0" \
      | jq -r '.id')
    # List branch policies
    curl -s -H "$AUTH" \
-     "$AZDO_ORG_URL/$AZDO_PROJECT/_apis/policy/configurations?api-version=7.0" \
+     "$AZDO_ORG_URL/$AZDO_PROJECT_URL_SAFE/_apis/policy/configurations?api-version=7.0" \
      | jq "[.value[] | select(.settings.scope[]?.refName == \"refs/heads/$default_branch\" and .settings.scope[]?.repositoryId == \"$REPO_ID\")]"
    ```
 
@@ -386,7 +390,7 @@ If org/project extraction fails, report ⚠️ and skip branch policies.
    **REST fallback:**
    ```bash
    curl -s -X POST -H "$AUTH" -H "Content-Type: application/json" \
-     "$AZDO_ORG_URL/$AZDO_PROJECT/_apis/policy/configurations?api-version=7.0" \
+     "$AZDO_ORG_URL/$AZDO_PROJECT_URL_SAFE/_apis/policy/configurations?api-version=7.0" \
      -d "{
        \"isEnabled\": true,
        \"isBlocking\": true,

package/skills/dock/references/azdo-platform.md

@@ -54,6 +54,11 @@ elif echo "$REMOTE_URL" | grep -q 'visualstudio\.com'; then
   AZDO_ORG_URL="https://dev.azure.com/$AZDO_ORG"
 fi
 
+# URL-decode for CLI/display; keep URL-safe versions for REST API paths
+AZDO_PROJECT_URL_SAFE="$AZDO_PROJECT"
+AZDO_ORG=$(printf '%b' "${AZDO_ORG//%/\\x}")
+AZDO_PROJECT=$(printf '%b' "${AZDO_PROJECT//%/\\x}")
+
 if [ -z "$AZDO_ORG" ] || [ -z "$AZDO_PROJECT" ]; then
   echo "❌ Could not extract organization/project from remote URL"
   echo "   Remote: $REMOTE_URL"
@@ -72,7 +77,7 @@ az devops configure --defaults organization="$AZDO_ORG_URL" project="$AZDO_PROJE
 ```
 
 When `AZDO_MODE == rest`, store these for API calls:
-- Base URL: `$AZDO_ORG_URL/$AZDO_PROJECT/_apis`
+- Base URL: `$AZDO_ORG_URL/$AZDO_PROJECT_URL_SAFE/_apis`
 - Auth header: `Authorization: Basic $(echo -n ":$PAT" | base64)`
 
 Report in pre-flight:

package/skills/keel/references/azdo-platform.md

@@ -54,6 +54,11 @@ elif echo "$REMOTE_URL" | grep -q 'visualstudio\.com'; then
   AZDO_ORG_URL="https://dev.azure.com/$AZDO_ORG"
 fi
 
+# URL-decode for CLI/display; keep URL-safe versions for REST API paths
+AZDO_PROJECT_URL_SAFE="$AZDO_PROJECT"
+AZDO_ORG=$(printf '%b' "${AZDO_ORG//%/\\x}")
+AZDO_PROJECT=$(printf '%b' "${AZDO_PROJECT//%/\\x}")
+
 if [ -z "$AZDO_ORG" ] || [ -z "$AZDO_PROJECT" ]; then
   echo "❌ Could not extract organization/project from remote URL"
   echo "   Remote: $REMOTE_URL"
@@ -72,7 +77,7 @@ az devops configure --defaults organization="$AZDO_ORG_URL" project="$AZDO_PROJE
 ```
 
 When `AZDO_MODE == rest`, store these for API calls:
-- Base URL: `$AZDO_ORG_URL/$AZDO_PROJECT/_apis`
+- Base URL: `$AZDO_ORG_URL/$AZDO_PROJECT_URL_SAFE/_apis`
 - Auth header: `Authorization: Basic $(echo -n ":$PAT" | base64)`
 
 Report in pre-flight:

package/skills/manifest.json

@@ -1,12 +1,12 @@
 {
-  "generated": "2026-03-13T08:44:12.749Z",
+  "generated": "2026-03-17T01:20:17.972Z",
   "count": 10,
   "skills": [
     {
       "name": "brace",
       "directory": "brace",
       "description": "'Initialize any project directory with a standard scaffold for AI-assisted development. Creates specs/ and context/ directories, a project CLAUDE.md with development workflow and guardrails, .gitignore, and branch protection. Recommends claude-mem for persistent memory. Idempotent — safe to run on existing projects. Triggers: \"init project\", \"setup brace\", \"brace\", \"initialize\", \"bootstrap\", \"scaffold\".'",
-      "lines": 441,
+      "lines": 445,
       "hasScripts": false,
       "hasReferences": true,
       "hasAssets": true,
@@ -66,7 +66,7 @@
       "name": "rig",
       "directory": "rig",
       "description": "'Idempotently bootstrap any repository with standard development tools, hooks, and workflows. Use when starting work on a new repo, onboarding to an existing project, or ensuring a repo has proper CI/CD setup. Configures: git hooks (lefthook), commit message templates, PR templates, and GitHub Actions for lint/format/type-check/build. Prompts for user confirmation before changes. Triggers: \"bootstrap repo\", \"setup hooks\", \"configure CI\", \"rig\", \"standardize repo\".'",
-      "lines": 338,
+      "lines": 343,
       "hasScripts": false,
       "hasReferences": true,
       "hasAssets": true,
@@ -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": 428,
       "hasScripts": false,
       "hasReferences": true,
       "hasAssets": false,

package/skills/rig/SKILL.md

@@ -169,6 +169,11 @@ elif echo "$REMOTE_URL" | grep -q 'visualstudio\.com'; then
   AZDO_ORG_URL="https://dev.azure.com/$AZDO_ORG"
 fi
 
+# URL-decode for CLI/display; keep URL-safe versions for REST API paths
+AZDO_PROJECT_URL_SAFE="$AZDO_PROJECT"
+AZDO_ORG=$(printf '%b' "${AZDO_ORG//%/\\x}")
+AZDO_PROJECT=$(printf '%b' "${AZDO_PROJECT//%/\\x}")
+
 if [ -z "$AZDO_ORG" ] || [ -z "$AZDO_PROJECT" ]; then
   echo "❌ Could not extract organization/project from remote URL"
   echo "   Remote: $REMOTE_URL"
@@ -187,7 +192,7 @@ az devops configure --defaults organization="$AZDO_ORG_URL" project="$AZDO_PROJE
 ```
 
 When `AZDO_MODE == rest`, store these for API calls:
-- Base URL: `$AZDO_ORG_URL/$AZDO_PROJECT/_apis`
+- Base URL: `$AZDO_ORG_URL/$AZDO_PROJECT_URL_SAFE/_apis`
 - Auth header: `Authorization: Basic $(echo -n ":$PAT" | base64)`
 
 Report in pre-flight:

package/skills/ship/SKILL.md

@@ -185,6 +185,11 @@ elif echo "$REMOTE_URL" | grep -q 'visualstudio\.com'; then
   AZDO_ORG_URL="https://dev.azure.com/$AZDO_ORG"
 fi
 
+# URL-decode for CLI/display; keep URL-safe versions for REST API paths
+AZDO_PROJECT_URL_SAFE="$AZDO_PROJECT"
+AZDO_ORG=$(printf '%b' "${AZDO_ORG//%/\\x}")
+AZDO_PROJECT=$(printf '%b' "${AZDO_PROJECT//%/\\x}")
+
 if [ -z "$AZDO_ORG" ] || [ -z "$AZDO_PROJECT" ]; then
   echo "❌ Could not extract organization/project from remote URL"
   echo "   Remote: $REMOTE_URL"
@@ -203,14 +208,15 @@ az devops configure --defaults organization="$AZDO_ORG_URL" project="$AZDO_PROJE
 ```
 
 When `AZDO_MODE == rest`, store these for API calls:
-- Base URL: `$AZDO_ORG_URL/$AZDO_PROJECT/_apis`
+- Base URL: `$AZDO_ORG_URL/$AZDO_PROJECT_URL_SAFE/_apis`
 - Auth header: `Authorization: Basic $(echo -n ":$PAT" | base64)`
 
 Report in pre-flight:
 - ✅ `azdo context` — org: `{AZDO_ORG}`, project: `{AZDO_PROJECT}`
 - ❌ `azdo context` — could not parse from remote URL → halt with instructions
 
-Pass `{AZDO_MODE}`, `{AZDO_ORG}`, `{AZDO_PROJECT}`, `{AZDO_ORG_URL}` into
+Pass `{AZDO_MODE}`, `{AZDO_ORG}`, `{AZDO_PROJECT}`, `{AZDO_PROJECT_URL_SAFE}`,
+`{AZDO_ORG_URL}` into
 all stage prompts alongside `{PLATFORM}`.
 
 Read `default_branch` and `remote` from Stage 1's SYNC_REPORT. These are
@@ -339,13 +345,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 +363,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

@@ -5,7 +5,8 @@ substitutes template variables before launching each subagent.
 
 `{PLATFORM}` is either `github` or `azdo` (detected from remote URL).
 `{AZDO_MODE}` is `cli` or `rest` (only relevant when PLATFORM == azdo).
-`{AZDO_ORG}`, `{AZDO_PROJECT}`, `{AZDO_ORG_URL}` provide AzDO context.
+`{AZDO_ORG}`, `{AZDO_PROJECT}`, `{AZDO_PROJECT_URL_SAFE}`, `{AZDO_ORG_URL}` provide AzDO context.
+Use `{AZDO_PROJECT}` for CLI `--project` flags and display. Use `{AZDO_PROJECT_URL_SAFE}` in REST API URL paths.
 
 ---
 
@@ -100,7 +101,7 @@ FILES TO EXCLUDE: {FILES_TO_EXCLUDE}
      PR_JSON=$(curl -s -X POST \
        -H "$AUTH" \
        -H "Content-Type: application/json" \
-       "{AZDO_ORG_URL}/{AZDO_PROJECT}/_apis/git/repositories/$REPO_NAME/pullrequests?api-version=7.0" \
+       "{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_apis/git/repositories/$REPO_NAME/pullrequests?api-version=7.0" \
        -d "{\"sourceRefName\": \"refs/heads/$BRANCH\", \"targetRefName\": \"refs/heads/{DEFAULT_BRANCH}\", \"title\": \"<type>: <concise title>\", \"description\": \"## Summary\\n<1-3 sentences>\\n\\n## Changes\\n<bullets>\\n\\n## Testing\\n- [ ] <steps>\"}")
 
 6. **Gather info**
@@ -116,13 +117,13 @@ FILES TO EXCLUDE: {FILES_TO_EXCLUDE}
      PR_NUMBER=$(az repos pr list --source-branch "$BRANCH" --status active \
        --org "{AZDO_ORG_URL}" --project "{AZDO_PROJECT}" \
        --query '[0].pullRequestId' -o tsv)
-     PR_URL="{AZDO_ORG_URL}/{AZDO_PROJECT}/_git/$(basename -s .git "$(git remote get-url origin)")/pullrequest/$PR_NUMBER"
+     PR_URL="{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_git/$(basename -s .git "$(git remote get-url origin)")/pullrequest/$PR_NUMBER"
 
    **If PLATFORM == azdo AND AZDO_MODE == rest:**
      # Parse from the create response JSON:
      PR_NUMBER=$(echo "$PR_JSON" | jq -r '.pullRequestId')
      REPO_NAME=$(basename -s .git "$(git remote get-url origin)")
-     PR_URL="{AZDO_ORG_URL}/{AZDO_PROJECT}/_git/$REPO_NAME/pullrequest/$PR_NUMBER"
+     PR_URL="{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_git/$REPO_NAME/pullrequest/$PR_NUMBER"
 
    COMMITS=$(git log {REMOTE}/{DEFAULT_BRANCH}..HEAD --oneline)
    DIFF_STAT=$(git diff {REMOTE}/{DEFAULT_BRANCH} --shortstat)
@@ -244,7 +245,7 @@ BRANCH: {BRANCH}
    ```
    REPO_NAME=$(basename -s .git "$(git remote get-url origin)")
    AUTH="Authorization: Basic $(echo -n ":{PAT}" | base64)"
-   BUILDS_URL="{AZDO_ORG_URL}/{AZDO_PROJECT}/_apis/build/builds?branchName=refs/heads/$BRANCH&\$top=5&api-version=7.0"
+   BUILDS_URL="{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_apis/build/builds?branchName=refs/heads/$BRANCH&\$top=5&api-version=7.0"
 
    RUNS_FOUND=false
    for i in $(seq 1 8); do
@@ -259,7 +260,7 @@ BRANCH: {BRANCH}
    If no runs appear, check PR policy evaluations via REST:
    ```
    EVALS=$(curl -s -H "$AUTH" \
-     "{AZDO_ORG_URL}/{AZDO_PROJECT}/_apis/policy/evaluations?artifactId=vstfs:///CodeReview/CodeReviewId/{AZDO_PROJECT}/{PR_NUMBER}&api-version=7.0")
+     "{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_apis/policy/evaluations?artifactId=vstfs:///CodeReview/CodeReviewId/{AZDO_PROJECT_URL_SAFE}/{PR_NUMBER}&api-version=7.0")
    EVAL_COUNT=$(echo "$EVALS" | jq '.value | length')
    ```
    If no evaluations exist either, report `no_checks`.
@@ -323,22 +324,34 @@ FAILING CHECKS: {FAILING_CHECKS}
        --query "[?result=='failed'].id | [0]" -o tsv)
      az pipelines runs show --id $RUN_ID \
        --org "{AZDO_ORG_URL}" --project "{AZDO_PROJECT}" --output json
-     # Get timeline for detailed step failures:
-     az devops invoke --area build --resource timeline \
-       --route-parameters project="{AZDO_PROJECT}" buildId=$RUN_ID \
-       --org "{AZDO_ORG_URL}" \
-       --api-version 7.0 --query "records[?result=='failed'].{name:name, log:log.url}" -o table
+     # Download logs locally — more reliable than timeline API on legacy domains
+     LOGDIR=$(mktemp -d)
+     az pipelines logs download --run-id $RUN_ID --path "$LOGDIR" \
+       --org "{AZDO_ORG_URL}" --project "{AZDO_PROJECT}" 2>/dev/null
+     if [ -d "$LOGDIR" ] && [ "$(ls "$LOGDIR")" ]; then
+       grep -ril "error\|fail\|##vso\[task.logissue" "$LOGDIR" | head -5 | while read f; do
+         echo "=== $(basename "$f") ==="
+         grep -i "error\|fail\|##vso\[task.logissue" "$f" | tail -30
+       done
+     fi
+     rm -rf "$LOGDIR"
 
    **If PLATFORM == azdo AND AZDO_MODE == rest:**
      AUTH="Authorization: Basic $(echo -n ":{PAT}" | base64)"
      # Get failed build ID
      RUN_ID=$(curl -s -H "$AUTH" \
-       "{AZDO_ORG_URL}/{AZDO_PROJECT}/_apis/build/builds?branchName=refs/heads/{BRANCH}&resultFilter=failed&\$top=1&api-version=7.0" \
+       "{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_apis/build/builds?branchName=refs/heads/{BRANCH}&resultFilter=failed&\$top=1&api-version=7.0" \
        | jq -r '.value[0].id')
      # Get timeline for step-level failures
-     curl -s -H "$AUTH" \
-       "{AZDO_ORG_URL}/{AZDO_PROJECT}/_apis/build/builds/$RUN_ID/timeline?api-version=7.0" \
-       | jq '.records[] | select(.result=="failed") | {name, log: .log.url}'
+     TIMELINE=$(curl -s -H "$AUTH" \
+       "{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_apis/build/builds/$RUN_ID/timeline?api-version=7.0")
+     # Extract failed task names and log URLs
+     echo "$TIMELINE" | jq -r '.records[] | select(.result=="failed") | "\(.name): \(.log.url // "no log URL")"'
+     # Fetch actual log content from each failed task's log URL
+     for LOG_URL in $(echo "$TIMELINE" | jq -r '.records[] | select(.result=="failed") | .log.url // empty'); do
+       echo "=== Log: $LOG_URL ==="
+       curl -s -H "$AUTH" "$LOG_URL" | tail -50
+     done
 
 2. **Analyze and fix**
    Read the relevant source files, understand the failures, fix the code.
@@ -367,7 +380,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.
@@ -429,11 +443,11 @@ BRANCH_FLAGS: {--delete-branch (default) | omit if --keep-branch}
    **If PLATFORM == azdo AND AZDO_MODE == rest:**
      AUTH="Authorization: Basic $(echo -n ":{PAT}" | base64)"
      REPO_NAME=$(basename -s .git "$(git remote get-url origin)")
-     PR_API="{AZDO_ORG_URL}/{AZDO_PROJECT}/_apis/git/repositories/$REPO_NAME/pullrequests/{PR_NUMBER}"
+     PR_API="{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_apis/git/repositories/$REPO_NAME/pullrequests/{PR_NUMBER}"
 
      # 1. Check for rejected policy evaluations
      EVALS=$(curl -s -H "$AUTH" \
-       "{AZDO_ORG_URL}/{AZDO_PROJECT}/_apis/policy/evaluations?artifactId=vstfs:///CodeReview/CodeReviewId/{AZDO_PROJECT}/{PR_NUMBER}&api-version=7.0")
+       "{AZDO_ORG_URL}/{AZDO_PROJECT_URL_SAFE}/_apis/policy/evaluations?artifactId=vstfs:///CodeReview/CodeReviewId/{AZDO_PROJECT_URL_SAFE}/{PR_NUMBER}&api-version=7.0")
      REJECTED=$(echo "$EVALS" | jq '[.value[] | select(.status=="rejected")] | length')
      if [ "$REJECTED" != "0" ]; then
        echo "ERROR: PR has rejected policy evaluations — cannot merge"
@@ -458,12 +472,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 +482,5 @@ LAND_REPORT:
 - merge_commit: {hash}
 - merge_type: squash|merge
 - branch_deleted: true|false
-- branches_cleaned: {list or "none"}
 - errors: {any errors}
 ```