worktree-resolve

# Worktree Resolution **Recommended model tier:** balanced (sonnet) - this skill performs straightforward operations Merge all swarm worktrees back into the main branch after testing. ## Workflow ### 1. List Active Worktrees ```bash git worktree list ``` Check the AIDE worktree state file for metadata and status: ```bash cat .aide/state/worktrees.json ``` **Worktree Status Values:** - `active` - Agent is still working on this worktree - `agent-complete` - Agent finished, ready for merge review - `merged` - Successfully merged to main **Only merge worktrees with status `agent-complete`.** Example state file: ```json { "active": [ { "name": "story-auth", "path": ".aide/worktrees/story-auth", "branch": "feat/story-auth", "taskId": "story-auth", "agentId": "agent-auth", "status": "agent-complete", "createdAt": "2026-02-07T...", "completedAt": "2026-02-07T..." } ], "baseBranch": "main" } ``` ### 2. For Each Worktree Branch Run these steps for every `feat/*` branch from swarm: #### a) Test the Branch ```bash # Checkout the worktree cd .aide/worktrees/<name> # Run tests npm test # or appropriate test command # Run linting npm run lint # or appropriate lint command # Check build npm run build # if applicable ``` #### b) Review Changes ```bash # Back in main repo git log main..feat/<name> --oneline git diff main...feat/<name> --stat ``` #### c) Check Merge Compatibility ```bash # Dry-run merge chec...