Define task worktrees and merge lifecycle - #1
Merged
Conversation
Completed: - Made approved plans use designated worktrees by default and separated writer ownership from read-only attacks. - Added the merge directive for reflection, PR submission, review gates, merge, safe return, and owned-resource cleanup. - Added conflict-aware plan scoping and verified completion wording. - Installer merge tests passed: 4 tests. Diff checks passed. Decisions: - Keep lifecycle policy in CLAUDE.md, with README routing instead of a new MCP tool. - One worktree per independent editing task; coordinated helpers may share disjoint file ownership. - A merged PR alone never authorizes claiming local integration or cleanup is complete. Next: - Replace the Linux-specific preferred worktree path with a portable user-home location. - Evaluate ADHD-friendly communication guidance before changing the Monk personality. - Reinstall directives and restart agents only after the changes are ready to ship. Patterns: - Resolve competing goals before implementation. - Explicit merge intent can authorize a complete lifecycle without bypassing safety gates. - Clean only owned resources and preserve other agents work.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Verification
Scope
Documentation/directives only. Portable worktree path changes and global installation remain separate.