idd-skill idd-work.instructions.md

IDD — Work and Self-Review Phase (B + C)

Read this file after a successful claim. It covers worktree creation (B1), planning (B2), implementation (B3), and the self-review loop (C).

B1 — Create worktree (with branch)

Before creating, check for local conflicts in this order:

1. Ensure the local main branch is up to date and has no local commits. Run this from the primary worktree while on main:

   git fetch origin main
   git log origin/main..main --oneline
   

   If the second command outputs any lines, local main has unpushed commits — stop and report, do not force-reset main. Otherwise, fast-forward to origin:

   git merge --ff-only origin/main
   

   After this main fast-forward, do not change the primary worktree's HEAD off main for any reason during B1 — see Anti-patterns below for the forbidden commands and the allowed HEAD-preserving exceptions (read-only inspection, and the HEAD-preserving branch/worktree commands used by Steps 2-3 below and by Worktree creation).

2. Run git worktree list — if a worktree for the branch already exists, inspect and acquire its worktree-local claim lock before reusing or removing it (same helper commands as there); do not run git worktree remove while the lock check is still a collision — resolve it via the Claim-state rule in idd-claim.instructions.md, and only remove the path once the current claim is authorized to take it over. Reusing it keeps the acquired lock; removing it means recreating the path and re-acquiring the lock before any install or other mutation (removal must precede branch deletion — git blocks deleting a checked-out branch).