mustard-claude 3.0.9 → 3.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mustard-claude",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "Framework-agnostic CLI for Claude Code project setup",
   "type": "module",
   "bin": {

package/templates/commands/mustard/feature/SKILL.md

@@ -106,6 +106,7 @@ When user chooses "Approve and implement now":
 6. Dispatch agents (wave rules: DB+Backend parallel, Frontend after Backend). Agent prompt includes `{recommended_skills}` as skill hints — agents read SKILL.md of relevant skills before implementing
 7. Wave transitions between waves (from `pipeline-config.md`)
 8. On return: validate (build/type-check), update spec `[ ]` → `[x]` (line-by-line edits, NEVER copy entire spec blocks as old_string)
+8b. **Agent Memory:** After agents return and spec is updated, write agent memory: `echo '{"agent_type":"{type}","wave":{N},"pipeline":"{spec-name}","summary":"{what agent did}","details":{...}}' | node .claude/scripts/memory-write.js` — one per agent. Skip if single-wave pipeline (no downstream agents to benefit).
 9. **REVIEW** — dispatch review agent for each affected subproject (reads guards + relevant skills, runs 7-category checklist: SOLID, Design System, Patterns, i18n, Integration, Build, Elegance). REJECTED → fix + re-review (max 2 loops)
 10. All passed + APPROVED → CLOSE flow inline (sync registry, move spec, cleanup state)
 11. Failed → max 2 retries, then STOP + report

package/templates/commands/mustard/git/SKILL.md

@@ -1,244 +1,279 @@
-# /git - Git Operations
-
-> Commit, push, sync, PR, and deploy. Reads `mustard.json` for branch flow. Handles monorepo (submodules) and single repo automatically.
-
-## Trigger
-
-`/git <action>`
-
-## Actions
-
-| Action | Description |
-|--------|-------------|
-| `sync` | Pull parent branch into current branch |
-| `commit` | Create commit (no push) |
-| `push` | Sync + commit + push to remote |
-| `merge` | Promote current → parent (creates PR) |
-| `deploy` | Push + merge + inform about cascade |
-
-## Configuration
-
-Reads `mustard.json` from the **project root**. If not found, falls back to defaults.
-
-```json
-{
-  "git": {
-    "flow": {
-      "dev_*": "dev",
-      "dev": "main"
-    },
-    "provider": "github",
-    "submodules": true
-  }
-}
-```
-
-### Flow Resolution
-
-Match current branch against `flow` keys (glob patterns). First match wins.
-
-| Current branch | Pattern matched | Parent resolved |
-|---------------|----------------|-----------------|
-| `dev_rubens` | `dev_*` | `dev` |
-| `dev` | `dev` | `main` |
-| `feature/xyz` | no match | **error**: no parent configured |
-
-**Fallback** (no `mustard.json`): parent = default branch (`main` or `master`).
-
-### Provider CLI
-
-| Provider | CLI | PR command |
-|----------|-----|------------|
-| `github` | `gh` | `gh pr create` |
-| `gitlab` | `glab` | `glab mr create` |
-| `bitbucket` | `bb` | `bb pr create` (manual) |
-
-## Behavior
-
-- **ZERO confirmations** — analyze, execute, done. NEVER ask for approval.
-- **ZERO questions** — do NOT ask what to commit or whether to proceed.
-- **Minimize Bash calls** — chain EVERYTHING with `&&`. One Bash call per repo max.
-- **No investigation** — if a submodule is dirty, commit it.
-- Submodules BEFORE parent (always).
-- **Single repo**: skip all submodule steps — just operate on the root.
-
----
-
-## Step 0 — Resolve Parent (all actions except commit)
-
-```bash
-cat mustard.json 2>/dev/null
-git rev-parse --abbrev-ref HEAD
-```
-
-Match the current branch against `git.flow` patterns. Store as `$PARENT`.
-If no match and no `mustard.json`: `$PARENT` = default branch (detect via `git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null || echo main`).
-
-Read `git.provider` from `mustard.json`. Fallback: read `git.pr.provider` (old format). Default: `github`.
-
----
-
-## sync
-
-Pull the parent branch changes into the current branch.
-
-### Single repo / Parent repo
-
-```bash
-git fetch origin $PARENT && git rebase origin/$PARENT
-```
-
-### Monorepo — submodules FIRST (PARALLEL, one Bash call each)
-
-```bash
-cd <SUBMODULE_ABSOLUTE_PATH> && git fetch origin $PARENT && git rebase origin/$PARENT
-```
-
-Then parent repo (same command at root).
-
-If rebase has conflicts → abort rebase, report to user, STOP.
-
----
-
-## commit
-
-### 1. Analyze all changes (single parallel batch)
-
-Run in **one parallel batch**:
-- `git status`
-- `git submodule status` (skip if no `.gitmodules`)
-- `git diff`
-- `git log --oneline -5`
-
-### 2. Commit dirty submodules (if any — monorepo only)
-
-Launch **ONE parallel Task agent per dirty submodule** (`model: "haiku"`). Each agent runs ONE chained Bash command:
-
-```bash
-cd <SUBMODULE_ABSOLUTE_PATH> && git add -A && git diff --cached --stat && git commit -m "<message>"
-```
-
-### 3. Commit parent repo
-
-```bash
-git add -A && git diff --cached --stat && git commit -m "<message>"
-```
-
-### Message Format
-
-```
-<type>: <short description>
-
-<detailed description if needed>
-
-Co-Authored-By: Claude <noreply@anthropic.com>
-```
-
-Types: feat, fix, refactor, docs, chore, test
-
----
-
-## push
-
-Sequential: **sync first**, then commit + push.
-
-### Phase 1 — Sync
-
-Execute `sync` action. If conflicts → STOP.
-
-### Phase 2 — Commit & Push
-
-#### Submodules (PARALLEL — monorepo only, one Bash call each)
-
-```bash
-cd <SUBMODULE_ABSOLUTE_PATH> && git add -A && git commit -m "<message>" && git push origin <branch>
-```
-
-#### Parent / Root (ONE Bash call)
-
-```bash
-git add -A && git commit -m "<message>" && git push origin <branch>
-```
-
----
-
-## merge
-
-Promote current branch into its parent via Pull Request.
-
-### Step 1 — Ensure pushed
-
-Check if local is ahead of remote. If yes, execute `push` first.
-
-### Step 2 — Create PR
-
-Create a Pull Request from current → parent branch.
-
-#### GitHub (`gh`)
-
-```bash
-gh pr create --base $PARENT --title "<title>" --body "<body>"
-```
-
-#### GitLab (`glab`)
-
-```bash
-glab mr create --target-branch $PARENT --title "<title>" --description "<body>"
-```
-
-#### PR Title & Body
-
-- Title: conventional commit style — `<type>: <short description>`
-- Body: auto-generated from commit log since divergence from parent:
-
-```bash
-git log $PARENT..HEAD --oneline
-```
-
-#### Monorepo Note
-
-PRs are created at the **parent repo level only**. Submodules are committed and pushed, but PRs are not created per submodule (submodules follow parent via ref update).
-
-After PR is created, output:
-
-> PR created: {url}. Run /review to review it.
-
----
-
-## deploy
-
-Sequential phases. Each phase must complete before the next.
-
-### Phase 1 — Push
-
-Execute `push` action (includes sync).
-
-### Phase 2 — Merge to parent
-
-Execute `merge` action (current → parent).
-
-### Phase 3 — Cascade (if parent ≠ production)
-
-If `$PARENT` also has a parent in the flow (e.g., `dev` → `main`), inform the user:
-
-> PR created: `dev_rubens → dev`. To promote `dev → main`, switch to `dev` and run `/git deploy` again.
-
-Do NOT auto-cascade — each promotion is a deliberate decision.
-
----
-
-## Cautions
-
-- Aborts if ANY repo has merge conflicts (sync or push)
-- Submodules BEFORE parent (in sync, push, and commit)
-- NEVER use `git add .` — use `git add -A` from the correct directory
-- If any operation fails, stop and report
-- PR creation requires the provider CLI to be installed and authenticated
-
-## Performance Budget
-
-- **Max Task agents**: 1 per dirty submodule
-- **Max Bash calls per agent**: 1 (all commands chained)
-- **Max API calls total**: ≤ 12
-
-ULTRATHINK
+# /git - Git Operations
+
+> Commit, push, sync, PR, and deploy. Reads `mustard.json` for branch flow. Handles monorepo (submodules) and single repo automatically.
+
+## Trigger
+
+`/git <action>`
+
+## Actions
+
+| Action | Description |
+|--------|-------------|
+| `sync` | Pull parent branch into current branch |
+| `commit` | Create commit (no push) |
+| `push` | Commit + push to remote |
+| `merge` | Push + cascade PRs to parent (dev_rubens → dev) |
+| `merge main` | Cascade PRs from dev → main (explicit, when ready) |
+
+## Configuration
+
+Reads `mustard.json` from the **project root**. If not found, falls back to defaults.
+
+```json
+{
+  "git": {
+    "flow": {
+      "dev_*": "dev",
+      "dev": "main"
+    },
+    "provider": "github",
+    "submodules": true
+  }
+}
+```
+
+### Flow Resolution
+
+Match current branch against `flow` keys (glob patterns). First match wins.
+
+| Current branch | Pattern matched | Parent resolved |
+|---------------|----------------|-----------------|
+| `dev_rubens` | `dev_*` | `dev` |
+| `dev` | `dev` | `main` |
+| `feature/xyz` | no match | **error**: no parent configured |
+
+**Fallback** (no `mustard.json`): parent = default branch (`main` or `master`).
+
+### Provider CLI
+
+| Provider | CLI | PR command |
+|----------|-----|------------|
+| `github` | `gh` | `gh pr create` |
+| `gitlab` | `glab` | `glab mr create` |
+| `bitbucket` | `bb` | `bb pr create` (manual) |
+
+## Behavior
+
+- **ZERO confirmations** — analyze, execute, done. NEVER ask for approval.
+- **ZERO questions** — do NOT ask what to commit or whether to proceed.
+- **Minimize Bash calls** — chain EVERYTHING with `&&`. One Bash call per repo max.
+- **No investigation** — if a submodule is dirty, commit it.
+- Submodules BEFORE parent (always).
+- **Single repo**: skip all submodule steps — just operate on the root.
+
+---
+
+## Step 0 — Resolve Parent (all actions except commit)
+
+```bash
+cat mustard.json 2>/dev/null
+git rev-parse --abbrev-ref HEAD
+```
+
+Match the current branch against `git.flow` patterns. Store as `$PARENT`.
+If no match and no `mustard.json`: `$PARENT` = default branch (detect via `git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null || echo main`).
+
+Read `git.provider` from `mustard.json`. Fallback: read `git.pr.provider` (old format). Default: `github`.
+
+---
+
+## sync
+
+Pull the parent branch changes into the current branch.
+
+### Single repo / Parent repo
+
+```bash
+git fetch origin $PARENT && git rebase origin/$PARENT
+```
+
+### Monorepo — submodules FIRST (PARALLEL, one Bash call each)
+
+```bash
+cd <SUBMODULE_ABSOLUTE_PATH> && git fetch origin $PARENT && git rebase origin/$PARENT
+```
+
+Then parent repo (same command at root).
+
+If rebase has conflicts → abort rebase, report to user, STOP.
+
+---
+
+## commit
+
+### 1. Analyze all changes (single parallel batch)
+
+Run in **one parallel batch**:
+- `git status`
+- `git submodule status` (skip if no `.gitmodules`)
+- `git diff`
+- `git log --oneline -5`
+
+### 2. Commit dirty submodules (if any — monorepo only)
+
+Launch **ONE parallel Task agent per dirty submodule** (`model: "haiku"`). Each agent runs ONE chained Bash command:
+
+```bash
+cd <SUBMODULE_ABSOLUTE_PATH> && git add -A && git diff --cached --stat && git commit -m "<message>"
+```
+
+### 3. Commit parent repo
+
+```bash
+git add -A && git diff --cached --stat && git commit -m "<message>"
+```
+
+### Message Format
+
+```
+<type>: <short description>
+
+<detailed description if needed>
+
+Co-Authored-By: Claude <noreply@anthropic.com>
+```
+
+Types: feat, fix, refactor, docs, chore, test
+
+---
+
+## push
+
+Sequential: **sync first**, then commit + push.
+
+### Phase 1 — Sync
+
+Execute `sync` action. If conflicts → STOP.
+
+### Phase 2 — Commit & Push
+
+#### Submodules (PARALLEL — monorepo only, one Bash call each)
+
+```bash
+cd <SUBMODULE_ABSOLUTE_PATH> && git add -A && git commit -m "<message>" && git push origin <branch>
+```
+
+#### Parent / Root (ONE Bash call)
+
+```bash
+git add -A && git commit -m "<message>" && git push origin <branch>
+```
+
+---
+
+## merge
+
+Promote current branch into its parent via Pull Request — **recursively through the entire flow chain**, including all submodules.
+
+### Step 1 — Ensure pushed
+
+Check if local is ahead of remote. If yes, execute `push` first.
+
+### Step 2 — Cascade merge (recursive)
+
+Resolve the **full flow chain** from the current branch to the terminal branch (the one with no parent in the flow). Example: `dev_rubens` → `dev` → `main` = 2 hops.
+
+**For each hop** (e.g., first `dev_rubens → dev`, then `dev → main`):
+
+#### 2a. Submodules FIRST (PARALLEL — monorepo only)
+
+For each submodule that has commits ahead of `$TARGET`:
+
+```bash
+cd <SUBMODULE_ABSOLUTE_PATH> && git fetch origin && git log origin/$TARGET..origin/$SOURCE --oneline
+```
+
+If commits exist, create PR and merge immediately:
+
+```bash
+# GitHub
+cd <SUBMODULE_ABSOLUTE_PATH> && gh pr create --head $SOURCE --base $TARGET --title "<title>" --body "<body>"
+cd <SUBMODULE_ABSOLUTE_PATH> && gh pr merge --merge
+```
+
+```bash
+# GitLab
+cd <SUBMODULE_ABSOLUTE_PATH> && glab mr create --source-branch $SOURCE --target-branch $TARGET --title "<title>" --description "<body>" --remove-source-branch=false
+cd <SUBMODULE_ABSOLUTE_PATH> && glab mr merge
+```
+
+Skip submodules with no commits ahead (nothing to merge).
+
+#### 2b. Parent repo
+
+Same as submodules — create PR + merge for this hop:
+
+```bash
+# GitHub
+gh pr create --head $SOURCE --base $TARGET --title "<title>" --body "<body>"
+gh pr merge --merge
+```
+
+#### 2c. Next hop
+
+After all PRs are merged for this hop, advance to the next hop in the chain. Repeat 2a–2b.
+
+**Auto-merge stops at the first parent** (e.g., `dev_rubens → dev`). The final promotion to the terminal branch (e.g., `dev → main`) is **never automatic** — it requires a separate explicit `/git merge main` call.
+
+### PR Title & Body
+
+- Title: conventional commit style — `<type>: <short description>`
+- Body: auto-generated from commit log since divergence:
+
+```bash
+git log $TARGET..$SOURCE --oneline
+```
+
+### Example: `/git merge` from `dev_rubens`
+
+```
+dev_rubens → dev (auto)
+  ├── Competi.Backend:  PR #N created + merged
+  ├── Competi.Frontend: PR #N created + merged
+  ├── Competi.Libs:     PR #N created + merged
+  ├── Competi.Admin:    (skipped — no commits ahead)
+  └── Competi.CRM:      PR #N created + merged
+```
+
+### Example: `/git merge main` (explicit — when ready for production)
+
+```
+dev → main
+  ├── Competi.Backend:  PR #N created + merged
+  ├── Competi.Frontend: PR #N created + merged
+  ├── Competi.Libs:     PR #N created + merged
+  └── Competi.CRM:      PR #N created + merged
+```
+
+### Output
+
+Print a summary table at the end:
+
+```
+| Repo            | Status          |
+|-----------------|-----------------|
+| Backend         | PR #1 merged    |
+| Frontend        | PR #1 merged    |
+| Libs            | PR #1 merged    |
+| Admin           | skipped         |
+| CRM (parent)    | PR #3 merged    |
+```
+
+---
+
+## Cautions
+
+- Aborts if ANY repo has merge conflicts (sync or push)
+- Submodules BEFORE parent (in sync, push, and commit)
+- NEVER use `git add .` — use `git add -A` from the correct directory
+- If any operation fails, stop and report
+- PR creation requires the provider CLI to be installed and authenticated
+
+## Performance Budget
+
+- **Max Task agents**: 1 per dirty submodule
+- **Max Bash calls per agent**: 1 (all commands chained)
+- **Max API calls total**: ≤ 12
+
+ULTRATHINK

package/templates/commands/mustard/resume/SKILL.md

@@ -72,6 +72,12 @@ Resumes an interrupted pipeline. The main context BECOMES the Pipeline Runner
 
 17. **Dispatch:** TaskUpdate(in_progress) + pipeline state. ALL agents in same wave → SINGLE message (multiple Task invocations). **Pass `model` from pipeline state** (e.g. `model: "opus"`) in each Task tool call — this overrides the agent YAML default. On return: pipeline state update, spec `[ ]` → `[x]` (use `replace_all` per section header, or line-by-line — NEVER copy entire spec blocks as old_string), TaskUpdate(completed), advance wave.
 
+17b. **Agent Memory:** After each wave completes and spec checkboxes are updated, write agent memories for downstream waves:
+    ```bash
+    echo '{"agent_type":"{agent_type}","wave":{N},"pipeline":"{spec-name}","summary":"{1-line summary of what agent did}","details":{"files_modified":[...],"decisions":[...]}}' | node .claude/scripts/memory-write.js
+    ```
+    One call per agent in the completed wave. Summary ≤300 chars (key facts: files created, patterns used, endpoints added). Skip if no downstream waves remain.
+
 ### Step 4: Validate, Review & Complete
 
 18. **VALIDATE** — Parse agent results: Backend→`dotnet build`, Frontend→`pnpm build`, Mobile→`fvm flutter analyze`. All passed → next. Failed → **granular retry** (see below).