@slamb2k/mad-skills 2.0.36 → 2.0.38

package/skills/sync/scripts/sync.sh

@@ -0,0 +1,158 @@
+#!/usr/bin/env bash
+# sync.sh — Deterministic repo sync with origin/default-branch
+# Usage: sync.sh <REMOTE> <DEFAULT_BRANCH> [--no-stash] [--no-cleanup] [--no-rebase]
+# Output: Key-value SYNC_REPORT between BEGIN/END markers on stdout
+# Exit codes: 0=success, 1=fatal, 2=partial (conflict warnings)
+set -uo pipefail
+
+REMOTE="${1:?Usage: sync.sh <REMOTE> <DEFAULT_BRANCH> [flags]}"
+DEFAULT_BRANCH="${2:?Usage: sync.sh <REMOTE> <DEFAULT_BRANCH> [flags]}"
+shift 2
+
+NO_STASH=false; NO_CLEANUP=false; NO_REBASE=false
+for arg in "$@"; do
+  case "$arg" in
+    --no-stash)   NO_STASH=true ;;
+    --no-cleanup) NO_CLEANUP=true ;;
+    --no-rebase)  NO_REBASE=true ;;
+  esac
+done
+
+# Report fields
+STATUS="success"
+MAIN_UPDATED_TO=""
+CURRENT_BRANCH=""
+STASH_STATUS="none"
+REBASE_STATUS="skipped"
+BRANCHES_CLEANED="none"
+ERRORS="none"
+STASH_CREATED=false
+EXIT_CODE=0
+
+emit_report() {
+  echo "SYNC_REPORT_BEGIN"
+  echo "status=$STATUS"
+  echo "remote=$REMOTE"
+  echo "default_branch=$DEFAULT_BRANCH"
+  echo "main_updated_to=$MAIN_UPDATED_TO"
+  echo "current_branch=$CURRENT_BRANCH"
+  echo "stash=$STASH_STATUS"
+  echo "rebase=$REBASE_STATUS"
+  echo "branches_cleaned=$BRANCHES_CLEANED"
+  echo "errors=$ERRORS"
+  echo "SYNC_REPORT_END"
+  exit "$EXIT_CODE"
+}
+
+# Step 1: Check state
+BRANCH=$(git branch --show-current 2>/dev/null || echo "DETACHED")
+CURRENT_BRANCH="$BRANCH"
+
+if [ "$BRANCH" = "DETACHED" ]; then
+  STATUS="failed"
+  ERRORS="Detached HEAD — cannot sync. Checkout a branch first."
+  EXIT_CODE=1
+  emit_report
+fi
+
+HAS_CHANGES=false
+if [ -n "$(git status --porcelain 2>/dev/null | head -1)" ]; then
+  HAS_CHANGES=true
+fi
+
+# Step 2: Stash changes
+if [ "$HAS_CHANGES" = true ] && [ "$NO_STASH" = false ]; then
+  if git stash push -m "sync-auto-stash-$(date +%Y%m%d-%H%M%S)" 2>/dev/null; then
+    STASH_CREATED=true
+  fi
+fi
+
+# Step 3: Sync default branch
+git fetch "$REMOTE" 2>/dev/null
+
+if [ "$BRANCH" != "$DEFAULT_BRANCH" ]; then
+  git checkout "$DEFAULT_BRANCH" 2>/dev/null
+fi
+
+if ! git pull "$REMOTE" "$DEFAULT_BRANCH" --ff-only 2>/dev/null; then
+  if ! git pull "$REMOTE" "$DEFAULT_BRANCH" --rebase 2>/dev/null; then
+    STATUS="failed"
+    ERRORS="Failed to pull $REMOTE/$DEFAULT_BRANCH"
+    EXIT_CODE=1
+    # Try to get back to original branch
+    [ "$BRANCH" != "$DEFAULT_BRANCH" ] && git checkout "$BRANCH" 2>/dev/null
+    # Restore stash if we created one
+    [ "$STASH_CREATED" = true ] && git stash pop 2>/dev/null
+    emit_report
+  fi
+fi
+
+MAIN_COMMIT=$(git rev-parse --short HEAD 2>/dev/null)
+MAIN_MESSAGE=$(git log -1 --format=%s 2>/dev/null)
+MAIN_UPDATED_TO="$MAIN_COMMIT - $MAIN_MESSAGE"
+
+# Step 4: Return to branch and update
+if [ "$BRANCH" != "$DEFAULT_BRANCH" ]; then
+  git checkout "$BRANCH" 2>/dev/null
+
+  if [ "$NO_REBASE" = true ]; then
+    if ! git merge "$DEFAULT_BRANCH" --no-edit 2>/dev/null; then
+      REBASE_STATUS="conflict — merge aborted"
+      EXIT_CODE=2
+    else
+      REBASE_STATUS="success"
+    fi
+  else
+    if ! git rebase "$DEFAULT_BRANCH" 2>/dev/null; then
+      git rebase --abort 2>/dev/null
+      REBASE_STATUS="conflict — aborted, branch unchanged"
+      EXIT_CODE=2
+    else
+      REBASE_STATUS="success"
+    fi
+  fi
+fi
+
+CURRENT_BRANCH=$(git branch --show-current 2>/dev/null)
+
+# Step 5: Restore stash
+if [ "$STASH_CREATED" = true ]; then
+  if git stash pop 2>/dev/null; then
+    STASH_STATUS="restored"
+  else
+    STASH_STATUS="conflict — run 'git stash show' to inspect"
+    EXIT_CODE=2
+  fi
+fi
+
+# Step 6: Cleanup branches
+if [ "$NO_CLEANUP" = false ]; then
+  git fetch --prune 2>/dev/null
+
+  CLEANED=()
+
+  # Delete branches whose remote is gone
+  while IFS= read -r b; do
+    [ -z "$b" ] && continue
+    [ "$b" = "$CURRENT_BRANCH" ] && continue
+    if git branch -d "$b" 2>/dev/null; then
+      CLEANED+=("$b")
+    fi
+  done < <(git branch -vv 2>/dev/null | grep ': gone]' | awk '{print $1}')
+
+  # Delete branches fully merged into default branch
+  while IFS= read -r b; do
+    b=$(echo "$b" | xargs)
+    [ -z "$b" ] && continue
+    [ "$b" = "$CURRENT_BRANCH" ] && continue
+    if git branch -d "$b" 2>/dev/null; then
+      CLEANED+=("$b")
+    fi
+  done < <(git branch --merged "$DEFAULT_BRANCH" 2>/dev/null | grep -v '^\*' | grep -v "$DEFAULT_BRANCH")
+
+  if [ ${#CLEANED[@]} -gt 0 ]; then
+    BRANCHES_CLEANED=$(IFS=,; echo "${CLEANED[*]}")
+  fi
+fi
+
+emit_report

package/agents/ship-analyzer.md

@@ -1,106 +0,0 @@
----
-name: ship-analyzer
-description: >
-  Analyzes working tree changes, creates semantic commits with well-crafted messages,
-  pushes to a feature branch, and creates a detailed pull request. Use this agent for
-  the commit+push+PR phase of shipping code. It reads diffs and source files to
-  understand what changed and why, producing high-quality commit messages and PR
-  descriptions that a Bash-only agent cannot.
-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.
-2. **Semantic grouping** — Group related changes into logical commits. A "logical group" shares a single purpose (e.g., all security changes together, all test updates together).
-3. **Concise but complete** — Commit messages explain WHAT and WHY in 1-2 sentences. PR descriptions give the full picture.
-4. **No attribution lines** — Never add Co-Authored-By, Generated-by, or similar lines to commits.
-
-## Commit Message Format
-
-```
-<type>(<scope>): <imperative description>
-
-<optional body: what changed and why, wrapped at 72 chars>
-```
-
-Types: `feat`, `fix`, `refactor`, `docs`, `chore`, `test`, `perf`
-
-Examples of GOOD messages:
-- `feat(auth): replace pairing gate with channel allowlist`
-- `fix(memory): correct positional arg order in get_recent_commitments`
-- `refactor(workspace): collapse per-user directories to single workspace`
-- `test(commitments): update calls for keyword-arg signatures`
-
-Examples of BAD messages:
-- `update files` (too vague)
-- `feat: changes to auth system` (no scope, vague description)
-- `fix various issues across the codebase` (multiple concerns in one)
-
-## PR Description Format
-
-```markdown
-## Summary
-<1-3 sentences: what this PR accomplishes and why>
-
-## Changes
-<bullet list of key changes, grouped logically>
-
-## Testing
-- [ ] <specific verification steps>
-```
-
-Keep the PR title under 72 characters. Use the same `<type>: <description>` format.
-
-## Workflow
-
-When given a set of files to ship:
-
-1. **Understand the changes**
-   - Run `git diff` and `git diff --cached` to see all changes
-   - Read source files where the diff alone doesn't explain intent
-   - Identify the logical groupings
-
-2. **Create branch** (if on main)
-   - Derive a semantic branch name from the changes: `feature/`, `fix/`, `refactor/`, `docs/`, `chore/`
-
-3. **Commit in logical groups**
-   - Stage specific files per group with `git add <files>`
-   - Write a commit message using the format above
-   - Use HEREDOC for multi-line messages
-
-4. **Push**
-   - `git push -u origin <branch>`
-
-5. **Create PR** (use the PLATFORM variable — do NOT guess)
-   - Read the full diff against main to write the PR description
-   - **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
-
-## Important Rules
-
-- If the caller specifies which files to include, respect that exactly — do not add extra files
-- If the caller provides context about the changes (e.g., "single-tenant simplification"), use that to inform your descriptions
-- When changes span many files, prioritize reading the most impactful diffs (source > tests > config)
-- Use `git add -p` when only some hunks in a file should be in a given commit
-- Always verify the branch pushed successfully before creating the PR