@slamb2k/mad-skills 2.0.7 → 2.0.9

package/skills/sync/SKILL.md

@@ -1,11 +1,8 @@
 ---
 name: sync
-description: >
-  Sync local repository with origin/main. Use before starting new work, after
-  completing a PR, or when needing latest upstream changes. Safely stashes
-  uncommitted changes, fetches and pulls origin/main, restores stash, and cleans
-  up stale local branches (merged or with deleted remotes). Invoke when switching
-  contexts or preparing for new feature work.
+description: Sync local repository with origin/main. Use before starting new work, after completing a PR, or when needing latest upstream changes. Safely stashes uncommitted changes, fetches and pulls origin/main, restores stash, and cleans up stale local branches (merged or with deleted remotes). Invoke when switching contexts or preparing for new feature work.
+argument-hint: --no-stash, --no-cleanup, --no-rebase (optional flags)
+allowed-tools: Bash
 ---
 
 # Sync - Repository Synchronization
@@ -35,20 +32,181 @@ Taglines:
 - 🔁 Rebase, merge, rinse, repeat!
 - 🎬 Previously on main...
 
-Follow instructions in: [instructions.md](instructions.md)
-
-## Subagent Architecture
+---
 
-Single **Bash** subagent with **haiku** model. Pure git commands — no code
-analysis needed, so the cheapest/fastest model is used. All git output stays
-in the subagent context; the primary agent only sees the structured SYNC_REPORT.
+Synchronize local repository with the remote default branch using a single
+Bash subagent to isolate all git operations from the primary conversation.
 
 ## Flags
 
-- `--no-stash` — Skip auto-stashing uncommitted changes
-- `--no-cleanup` — Skip deleting stale local branches
-- `--no-rebase` — Use merge instead of rebase on feature branches
+Parse optional flags from the request:
+- `--no-stash`: Don't auto-stash uncommitted changes
+- `--no-cleanup`: Don't delete stale local branches
+- `--no-rebase`: Use merge instead of rebase when on a feature branch
+
+---
+
+## Pre-flight
+
+Before starting, check all dependencies in this table:
+
+| Dependency | Type | Check | Required | Resolution | Detail |
+|-----------|------|-------|----------|------------|--------|
+| git | cli | `git --version` | yes | stop | Install from https://git-scm.com |
+
+For each row, in order:
+1. Run the Check command (for cli/npm) or test file existence (for agent/skill)
+2. If found: continue silently
+3. If missing: apply Resolution strategy
+   - **stop**: notify user with Detail, halt execution
+   - **url**: notify user with Detail (install link), halt execution
+   - **install**: notify user, run the command in Detail, continue if successful
+   - **ask**: notify user, offer to run command in Detail, continue either way (or halt if required)
+   - **fallback**: notify user with Detail, continue with degraded behavior
+4. After all checks: summarize what's available and what's degraded
+
+---
+
+## Pre-flight Detection
+
+Before launching the subagent, detect the remote and default branch:
+
+```
+REMOTE=$(git remote | head -1)   # usually "origin"
+DEFAULT_BRANCH=$(git symbolic-ref refs/remotes/$REMOTE/HEAD 2>/dev/null | sed 's|.*/||')
+```
+
+Fallback chain if `symbolic-ref` fails:
+1. Check `git show-ref --verify refs/heads/main` → use `main`
+2. Check `git show-ref --verify refs/heads/master` → use `master`
+3. If neither exists, report error and stop
+
+Pass `{REMOTE}` and `{DEFAULT_BRANCH}` into the subagent prompt.
+
+---
+
+## Execution
+
+Launch a **Bash subagent** (haiku — pure git commands, no code analysis needed):
+
+```
+Task(
+  subagent_type: "Bash",
+  model: "haiku",
+  description: "Sync repo with {DEFAULT_BRANCH}",
+  prompt: <see prompt below>
+)
+```
+
+### Subagent Prompt
 
-## Safety
+```
+Synchronize this git repository with {REMOTE}/{DEFAULT_BRANCH}. Execute the
+following steps in order and report results.
+
+Limit SYNC_REPORT to 15 lines maximum.
+
+FLAGS: {flags from request, or "none"}
+
+## Steps
+
+1. **Check state**
+   BRANCH=$(git branch --show-current 2>/dev/null || echo "DETACHED")
+   CHANGES=$(git status --porcelain | head -20)
+   Record: current_branch=$BRANCH, has_changes=(non-empty CHANGES)
+
+   If BRANCH == "DETACHED":
+     Record error: "Detached HEAD — cannot sync. Checkout a branch first."
+     Skip to Output.
+
+2. **Stash changes** (skip if --no-stash or no changes)
+   If has_changes and not --no-stash:
+     git stash push -m "sync-auto-stash-$(date +%Y%m%d-%H%M%S)"
+     Record: stash_created=true
+
+3. **Sync {DEFAULT_BRANCH}**
+   git fetch {REMOTE}
+   If BRANCH != "{DEFAULT_BRANCH}":
+     git checkout {DEFAULT_BRANCH}
+   git pull {REMOTE} {DEFAULT_BRANCH} --ff-only
+   If pull fails (diverged):
+     git pull {REMOTE} {DEFAULT_BRANCH} --rebase
+   Record: main_commit=$(git rev-parse --short HEAD)
+   Record: main_message=$(git log -1 --format=%s)
+
+4. **Return to branch and update** (skip if already on {DEFAULT_BRANCH})
+   If current_branch != "{DEFAULT_BRANCH}":
+     git checkout $BRANCH
+     If --no-rebase:
+       git merge {DEFAULT_BRANCH} --no-edit
+     Else:
+       git rebase {DEFAULT_BRANCH}
+       If rebase fails:
+         git rebase --abort
+         Record: rebase_status="conflict — aborted, branch unchanged"
+
+5. **Restore stash** (if created in step 2)
+   If stash_created:
+     git stash pop
+     If pop fails (conflict):
+       Record: stash="conflict — run 'git stash show' to inspect"
+     Else:
+       Record: stash="restored"
+
+6. **Cleanup branches** (skip if --no-cleanup)
+   git fetch --prune
+
+   # Delete branches whose remote is gone
+   for branch in $(git branch -vv | grep ': gone]' | awk '{print $1}'); do
+     if [ "$branch" != "$BRANCH" ]; then
+       git branch -d "$branch" 2>/dev/null && echo "Deleted: $branch"
+     fi
+   done
+
+   # Delete branches fully merged into {DEFAULT_BRANCH} (except current)
+   for branch in $(git branch --merged {DEFAULT_BRANCH} | grep -v '^\*' | grep -v '{DEFAULT_BRANCH}'); do
+     branch=$(echo "$branch" | xargs)
+     if [ "$branch" != "$BRANCH" ] && [ -n "$branch" ]; then
+       git branch -d "$branch" 2>/dev/null && echo "Deleted: $branch"
+     fi
+   done
+
+   Record: branches_cleaned={list of deleted branches, or "none"}
+
+7. **Final state**
+   echo "Branch: $(git branch --show-current)"
+   echo "HEAD: $(git log -1 --format='%h %s')"
+   echo "Status: $(git status --short | wc -l) modified files"
+
+## Output Format
+
+SYNC_REPORT:
+- status: success|failed
+- remote: {REMOTE}
+- default_branch: {DEFAULT_BRANCH}
+- main_updated_to: {commit} - {message}
+- current_branch: {branch}
+- stash: restored|none|conflict
+- rebase: success|conflict|skipped
+- branches_cleaned: {list or "none"}
+- errors: {any errors encountered}
+```
+
+---
+
+## Report to User
+
+Parse the subagent's SYNC_REPORT and present a clean summary:
+
+```
+Sync complete
+  Main:    {commit} - {message}
+  Branch:  {current_branch}
+  Stash:   {status}
+  Cleaned: {branches or "none"}
+```
 
-Safe by default: detached HEAD, rebase conflicts, and stash conflicts are detected and reported without destructive action.
+If errors occurred, report them clearly with suggested resolution:
+- Detached HEAD → suggest `git checkout <branch>`
+- Rebase conflict → suggest `git rebase {DEFAULT_BRANCH}` manually and resolve
+- Stash conflict → suggest `git stash show` and `git stash pop` manually

package/commands/brace.md

@@ -1,9 +0,0 @@
----
-description: Initialize project with GOTCHA/BRACE framework
-argument-hint: [--no-brace] [--force]
-allowed-tools: Bash, Read, Write, Edit, Glob, Grep, AskUserQuestion
----
-
-Flags: $ARGUMENTS
-
-Follow instructions in: ~/.claude/skills/brace/instructions.md

package/commands/build.md

@@ -1,9 +0,0 @@
----
-description: Context-isolated feature development pipeline
-argument-hint: <detailed design/plan to implement> [--skip-questions] [--skip-review] [--no-ship] [--parallel-impl]
-allowed-tools: Bash, Read, Write, Edit, Glob, Grep, AskUserQuestion
----
-
-Arguments: $ARGUMENTS
-
-Follow instructions in: ~/.claude/skills/build/instructions.md

package/commands/distil.md

@@ -1,9 +0,0 @@
----
-description: Generate multiple unique web design variations for any website or web application
-argument-hint: <count> --port <port> [--spec <path>] [--favorites <1,2,3>]
-allowed-tools: Bash, Read, Write, Edit, Glob, Grep, WebFetch
----
-
-Arguments: $ARGUMENTS
-
-Follow instructions in: ~/.claude/skills/distil/instructions.md

package/commands/prime.md

@@ -1,9 +0,0 @@
----
-description: Load project context for informed decisions
-argument-hint: security, routing, adhd, dashboard, office, memory, tasks, channels (comma-separated)
-allowed-tools: Read, Glob, Grep, LS
----
-
-Domain argument: $ARGUMENTS
-
-Follow instructions in: ~/.claude/skills/prime/instructions.md

package/commands/rig.md

@@ -1,9 +0,0 @@
----
-description: Bootstrap repo with standard dev tools - lefthook, commit templates, PR templates, CI
-argument-hint: --skip-system-check (optional)
-allowed-tools: Bash, Read, Write, Edit, Glob, Grep, AskUserQuestion
----
-
-Flags: $ARGUMENTS
-
-Follow instructions in: ~/.claude/skills/rig/instructions.md

package/commands/ship.md

@@ -1,9 +0,0 @@
----
-description: Ship changes - commit, push, create PR, wait for checks, merge, cleanup
-argument-hint: --pr-only, --no-squash, --keep-branch (optional flags)
-allowed-tools: Bash, Read, Glob, Grep, Skill
----
-
-Flags: $ARGUMENTS
-
-Follow instructions in: ~/.claude/skills/ship/instructions.md

package/commands/sync.md

@@ -1,9 +0,0 @@
----
-description: Sync with origin/main, stash/restore changes, clean up stale branches
-argument-hint: --no-stash, --no-cleanup, --no-rebase (optional flags)
-allowed-tools: Bash
----
-
-Flags: $ARGUMENTS
-
-Follow instructions in: ~/.claude/skills/sync/instructions.md

package/skills/brace/instructions.md

@@ -1,229 +0,0 @@
-# Brace Instructions
-
-Initialize any project directory with the GOTCHA/BRACE framework. Idempotent —
-safe to re-run on existing projects. Content templates and subagent prompts
-are in `references/`.
-
-**Key principle:** Scan first, present plan, get approval, then act.
-
-Phase prompts: `references/phase-prompts.md`
-Scaffold manifest: `references/scaffold-manifest.md`
-Report format: `references/report-template.md`
-
----
-
-## Flags
-
-Parse optional flags from the request:
-- `--no-brace` — Skip BRACE build methodology (goals/build_app.md)
-- `--force` — Overwrite existing files without prompting
-
----
-
-## Pre-flight
-
-Before starting, check all dependencies in this table:
-
-| Dependency | Type | Check | Required | Resolution | Detail |
-|-----------|------|-------|----------|------------|--------|
-| claude-mem | plugin | — | no | ask | `claude plugin install claude-mem` |
-
-For each row, in order:
-1. Run the Check command (for cli/npm) or test file existence (for agent/skill)
-2. If found: continue silently
-3. If missing: apply Resolution strategy
-   - **stop**: notify user with Detail, halt execution
-   - **url**: notify user with Detail (install link), halt execution
-   - **install**: notify user, run the command in Detail, continue if successful
-   - **ask**: notify user, offer to run command in Detail, continue either way (or halt if required)
-   - **fallback**: notify user with Detail, continue with degraded behavior
-4. After all checks: summarize what's available and what's degraded
-
-1. Capture **FLAGS** from the user's request
-2. Create a task list tracking all 5 phases
-
----
-
-## Phase 1: Directory Scan
-
-Launch **Bash** subagent (**haiku**):
-
-```
-Task(
-  subagent_type: "Bash",
-  model: "haiku",
-  description: "Scan directory for existing GOTCHA structure",
-  prompt: <read from references/phase-prompts.md#phase-1>
-)
-```
-
-Parse SCAN_REPORT. Extract:
-- `directory_name` (used as default project name)
-- `existing_dirs` / `missing_dirs`
-- `existing_files` / `missing_files`
-- `has_claude_md` / `has_gitignore`
-- `has_atlas` (legacy ATLAS naming detected)
-- `has_forge` (legacy FORGE naming detected)
-
----
-
-## Phase 1b: Legacy Upgrade Detection
-
-**Skip if neither `has_atlas` nor `has_forge` is true.**
-
-If SCAN_REPORT shows `has_atlas: true` or `has_forge: true`, ask the user via AskUserQuestion:
-
-   Question: "Legacy naming detected. Upgrade to BRACE?"
-   Options:
-   - "Yes, upgrade to BRACE" — Replace legacy references with BRACE equivalents
-   - "No, leave as-is" — Keep existing naming
-
-Store result as `upgrade_legacy: true|false` in USER_CONFIG.
-
----
-
-## Phase 2: Project Inquiry
-
-**Runs on primary thread** (user interaction required).
-
-1. Derive default project name from SCAN_REPORT `directory_name`
-2. Present via AskUserQuestion:
-
-   Question: "What to include in GOTCHA setup?"
-   Options:
-   - "Full GOTCHA + BRACE (Recommended)"
-   - "GOTCHA structure only (no BRACE methodology)"
-   - "Cancel"
-
-3. If not cancelled, ask for project description (one sentence) via
-   AskUserQuestion with free text.
-
-4. Ask installation level via AskUserQuestion:
-
-   Question: "Where should global preferences and universal principles go?"
-   Options:
-   - "Both — global + project (Recommended)" → portable AND global coverage
-   - "Global (~/.claude/CLAUDE.md) only" → applies to all projects
-   - "Project level only" → self-contained, portable
-
-5. Store as USER_CONFIG:
-   - project_name: from directory name or user override
-   - description: from user input
-   - include_brace: true/false (based on selection and `--no-brace`)
-   - install_level: "both" | "global" | "project"
-
-**If cancelled, stop here.**
-
----
-
-## Phase 3: Present Plan & Approve
-
-Build the ACTION_PLAN from SCAN_REPORT + USER_CONFIG + FLAGS.
-
-For each item in `references/scaffold-manifest.md`:
-- If component not selected in USER_CONFIG → status: "not selected"
-- If item already exists (from SCAN_REPORT) and no `--force` → status: "skip"
-- If item exists and `--force` → status: "overwrite"
-- If CLAUDE.md exists → status: "merge" (append GOTCHA section)
-- If .gitignore exists → status: "merge" (append missing entries)
-- Otherwise → status: "create"
-
-If `upgrade_legacy` is true in USER_CONFIG, set status "upgrade" for:
-- CLAUDE.md (replaces "merge" or "skip" — upgrade takes priority)
-- goals/build_app.md (replaces "skip")
-- goals/manifest.md (replaces "skip")
-
-Present plan summary to user via AskUserQuestion:
-
-```
-GOTCHA Framework Setup for: {project_name}
-
-Will create:  {list of items with status "create"}
-Will merge:   {list of items with status "merge"}
-Will upgrade: {list of items with status "upgrade" — legacy → BRACE}
-Will skip:    {count} existing items
-Not selected: {count} items
-Global config: {install_level description}
-
-Proceed?
-```
-
-Options: "Yes, proceed" / "Cancel"
-
-**If cancelled, stop here.**
-
----
-
-## Phase 4: Scaffold Structure
-
-Launch **general-purpose** subagent:
-
-```
-Task(
-  subagent_type: "general-purpose",
-  description: "Create GOTCHA framework structure",
-  prompt: <read from references/phase-prompts.md#phase-4>
-)
-```
-
-Before sending the prompt, substitute these variables:
-- `{ACTION_PLAN}` — the action plan from Phase 3
-- `{PROJECT_NAME}` — from USER_CONFIG
-- `{PROJECT_DESCRIPTION}` — from USER_CONFIG
-- `{INSTALL_LEVEL}` — from USER_CONFIG ("both", "global", or "project")
-- `{CLAUDE_MD_TEMPLATE}` — read from `references/claude-md-template.md`
-  (the section between BEGIN TEMPLATE and END TEMPLATE)
-- `{GITIGNORE_CONTENT}` — read from `assets/gitignore-template`
-- `{GOALS_MANIFEST}` — read from `references/scaffold-manifest.md`
-  (the goals/manifest.md content block)
-- `{TOOLS_MANIFEST}` — read from `references/scaffold-manifest.md`
-  (the tools/manifest.md content block)
-- `{BRACE_WORKFLOW}` — read from `references/brace-workflow.md`
-  (the section after the header, used for goals/build_app.md)
-- `{GLOBAL_PREFERENCES_CONTENT}` — read from `assets/global-preferences-template.md`
-  (the section between BEGIN TEMPLATE and END TEMPLATE)
-
-Parse SCAFFOLD_REPORT. If status is "failed", report to user and stop.
-
----
-
-## Phase 5: Verification & Report
-
-Launch **Bash** subagent (**haiku**):
-
-```
-Task(
-  subagent_type: "Bash",
-  model: "haiku",
-  description: "Verify GOTCHA structure",
-  prompt: <read from references/phase-prompts.md#phase-5>
-)
-```
-
-Parse VERIFY_REPORT. Present the final summary using the format in
-`references/report-template.md`.
-
----
-
-## Idempotency Rules
-
-- **Skip** directories and files that already exist (unless `--force`)
-- **Merge** CLAUDE.md: append GOTCHA section if file exists but lacks it
-- **Merge** .gitignore: append missing entries only
-- **Never delete** user content
-- **Never overwrite** without `--force` or explicit user approval
-
----
-
-## Error Handling
-
-Standard escalation pattern:
-1. If retryable (permission issue after mkdir): retry once
-2. If persistent: report to user with specific error
-3. Offer: skip and continue / abort
-4. Never silently swallow errors
-
-Common issues:
-- Permission denied → report, suggest checking directory permissions
-- CLAUDE.md merge conflict → show both versions, let user choose
-- Directory is read-only → abort with clear message