opencode-mad 0.3.7 → 0.3.8

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-mad",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Multi-Agent Dev - Parallel development orchestration plugin for OpenCode",
   "type": "module",
   "main": "plugins/mad-plugin.ts",

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