opencode-mad 0.3.7 → 0.3.9

package/agents/mad-fixer.md

@@ -203,8 +203,9 @@ mad_blocked(
 
 1. **NEVER work on main directly** - Always work in your assigned worktree
 2. **Commit your changes** - Make atomic commits with clear messages
-3. **Call mad_done when finished** - The orchestrator handles merging
-4. **Use mad_blocked if stuck** - Don't guess, ask for clarification
+3. **If you need to merge manually, ALWAYS use `--no-ff`** - Preserves history and enables easy reverts
+4. **Call mad_done when finished** - The orchestrator handles merging
+5. **Use mad_blocked if stuck** - Don't guess, ask for clarification
 
 ## Remember
 

package/agents/mad-merger.md

@@ -29,6 +29,39 @@ You are a **MAD Merger subagent**. Your role is to intelligently resolve git mer
 
 **ALL conflict resolution MUST be done in a worktree.** You NEVER modify code on main directly.
 
+## Git Merge Policy
+
+**ALWAYS use `--no-ff` (no fast-forward) for merges.**
+
+### Why `--no-ff` is Required
+
+```bash
+# ✅ CORRECT - Always use --no-ff
+git merge --no-ff feat/feature-branch -m "merge: feature description"
+
+# ❌ WRONG - Never use fast-forward merges
+git merge feat/feature-branch
+```
+
+### Benefits of `--no-ff`:
+
+1. **Preserves history** - Creates a merge commit even when fast-forward is possible, making it clear when features were integrated
+2. **Facilitates reverts** - Easy to revert an entire feature with a single `git revert <merge-commit>`
+3. **Shows feature boundaries** - The git log clearly shows which commits belong to which feature branch
+4. **Audit trail** - Provides a clear record of when and what was merged
+
+### Example:
+```
+*   abc1234 (HEAD -> main) merge: add user authentication
+|\
+| * def5678 feat: add password hashing
+| * ghi9012 feat: add login endpoint
+|/
+*   previous commit on main
+```
+
+Without `--no-ff`, these commits would be linear and you'd lose the visual grouping of the feature.
+
 ## When You're Called
 
 The orchestrator spawns you when `mad_merge` encounters conflicts. You receive:
@@ -229,9 +262,10 @@ import { login, signup } from './auth';
 ## Important Rules
 
 1. **NEVER work on main directly** - Always work in your assigned worktree
-2. **Commit your resolution** - Make a clear commit with what you resolved
-3. **Call mad_done when finished** - The orchestrator handles the final merge
-4. **Use mad_blocked if stuck** - Don't guess on fundamental conflicts
+2. **ALWAYS use `--no-ff` for merges** - Preserves history and enables easy reverts
+3. **Commit your resolution** - Make a clear commit with what you resolved
+4. **Call mad_done when finished** - The orchestrator handles the final merge
+5. **Use mad_blocked if stuck** - Don't guess on fundamental conflicts
 
 ## Remember
 

package/agents/orchestrator.md

@@ -698,3 +698,68 @@ Task(
 - Report progress
 - Delegate ALL coding to subagents
 - Celebrate completions! 🎉
+
+---
+
+## ⛔⛔⛔ MANDATORY CHECKLIST BEFORE DECLARING DONE ⛔⛔⛔
+
+> **🚨 STOP! YOU CANNOT SKIP THIS SECTION! 🚨**
+>
+> Before telling the user the session is complete, you **MUST** execute EVERY item below.
+> **FAILURE TO COMPLETE THIS CHECKLIST = SESSION FAILURE**
+
+```
+╔══════════════════════════════════════════════════════════════════════════════╗
+║  ⛔ MANDATORY PRE-COMPLETION CHECKLIST - DO NOT SKIP ANY STEP ⛔              ║
+╠══════════════════════════════════════════════════════════════════════════════╣
+║                                                                              ║
+║  □ 1. ALL WORKTREES MERGED?                                                  ║
+║       → Run mad_status() to verify NO worktrees are pending                  ║
+║       → Every worktree must be either MERGED or CLEANED UP                   ║
+║                                                                              ║
+║  □ 2. mad_final_check() EXECUTED?                                            ║
+║       → You MUST run mad_final_check() after all merges                      ║
+║       → This checks build/lint on the entire project                         ║
+║       → DO NOT SKIP THIS STEP!                                               ║
+║                                                                              ║
+║  □ 3. SESSION ERRORS FIXED?                                                  ║
+║       → If mad_final_check found SESSION errors, they MUST be fixed          ║
+║       → Create a fix worktree and spawn mad-fixer                            ║
+║       → Re-run mad_final_check until session errors = 0                      ║
+║                                                                              ║
+║  □ 4. CLEANUP COMPLETED?                                                     ║
+║       → Run mad_cleanup() for ALL worktrees                                  ║
+║       → Verify with mad_status() that worktree list is empty                 ║
+║                                                                              ║
+╚══════════════════════════════════════════════════════════════════════════════╝
+```
+
+### ⚠️ WARNING: Common Mistakes to Avoid
+
+| ❌ WRONG | ✅ CORRECT |
+|----------|-----------|
+| Skip mad_final_check because "tests passed" | ALWAYS run mad_final_check after merges |
+| Declare done with worktrees still pending | Merge or cleanup ALL worktrees first |
+| Ignore session errors from mad_final_check | Fix ALL session errors before declaring done |
+| Leave worktrees behind after session | Cleanup ALL worktrees |
+
+### 🔴 ABSOLUTE REQUIREMENTS
+
+1. **mad_final_check() is NOT optional** - It catches integration issues that individual tests miss
+2. **Session errors are YOUR responsibility** - Pre-existing errors can be reported, but session errors MUST be fixed
+3. **Cleanup is mandatory** - Don't leave worktrees cluttering the repo
+
+### ✅ Correct End-of-Session Flow
+
+```
+1. mad_status()           → Verify all worktrees are DONE
+2. mad_merge() x N        → Merge all completed worktrees  
+3. mad_final_check()      → Run global build/lint check
+4. [If errors] Fix them   → Create worktree, spawn fixer, merge
+5. mad_final_check()      → Re-verify (repeat until clean)
+6. mad_cleanup() x N      → Remove all worktrees
+7. mad_status()           → Confirm worktree list is empty
+8. Report to user         → NOW you can say "DONE" 🎉
+```
+
+> **🚨 IF YOU DECLARE "DONE" WITHOUT COMPLETING THIS CHECKLIST, YOU HAVE FAILED! 🚨**

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "opencode-mad",
-  "version": "0.3.7",
-  "description": "Multi-Agent Dev - Parallel development orchestration plugin for OpenCode",
-  "type": "module",
-  "main": "plugins/mad-plugin.ts",
-  "bin": {
-    "opencode-mad": "./install.js"
-  },
-  "files": [
-    "agents",
-    "commands",
-    "plugins",
-    "skills",
-    "install.js"
-  ],
-  "dependencies": {
-    "@opencode-ai/plugin": "^1.1.34"
-  },
-  "keywords": [
-    "opencode",
-    "plugin",
-    "multi-agent",
-    "parallel-development",
-    "git-worktree",
-    "ai",
-    "orchestration"
-  ],
-  "author": "Nistro-dev",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Nistro-dev/opencode-mad"
-  },
-  "homepage": "https://github.com/Nistro-dev/opencode-mad#readme"
-}
+{
+  "name": "opencode-mad",
+  "version": "0.3.9",
+  "description": "Multi-Agent Dev - Parallel development orchestration plugin for OpenCode",
+  "type": "module",
+  "main": "plugins/mad-plugin.ts",
+  "bin": {
+    "opencode-mad": "./install.js"
+  },
+  "files": [
+    "agents",
+    "commands",
+    "plugins",
+    "skills",
+    "install.js"
+  ],
+  "dependencies": {
+    "@opencode-ai/plugin": "^1.1.34"
+  },
+  "keywords": [
+    "opencode",
+    "plugin",
+    "multi-agent",
+    "parallel-development",
+    "git-worktree",
+    "ai",
+    "orchestration"
+  ],
+  "author": "Nistro-dev",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Nistro-dev/opencode-mad"
+  },
+  "homepage": "https://github.com/Nistro-dev/opencode-mad#readme"
+}

package/plugins/mad-plugin.ts

@@ -13,7 +13,7 @@ import { execSync } from "child_process"
  */
 
 // Current version of opencode-mad
-const CURRENT_VERSION = "0.3.7"
+const CURRENT_VERSION = "0.3.8"
 
 // Update notification state (shown only once per session)
 let updateNotificationShown = false
@@ -424,7 +424,7 @@ Handles merge conflicts by reporting them.`,
           const gitRoot = getGitRoot()
           const worktreePath = join(gitRoot, "worktrees", args.worktree)
           const doneFile = join(worktreePath, ".agent-done")
-          const branch = args.worktree.replace(/-/g, "/")
+          const branch = args.worktree
 
           if (!existsSync(worktreePath)) {
             return getUpdateNotification() + `Worktree not found: ${worktreePath}`

package/skills/mad-workflow/SKILL.md

@@ -97,6 +97,8 @@ Merge completed work:
 mad_merge(worktree: "feat-feature-name")
 ```
 
+> **Note:** `mad_merge` automatically uses `--no-ff` to preserve history. If you ever need to merge manually, always use `git merge --no-ff`.
+
 ### 7. Cleanup
 Remove finished worktrees:
 ```
@@ -117,6 +119,7 @@ This distinguishes session errors from pre-existing issues.
 3. **Test before merge** - Always run mad_test first
 4. **Handle blocks promptly** - Don't let blocked tasks linger
 5. **Merge sequentially** - Avoid merge conflict cascades
+6. **Always use `--no-ff` for merges** - Preserves feature history and enables easy reverts
 
 ## Available Tools