reconcilelisted
Install: claude install-skill conorbronsdon/agent-workspace
# /reconcile — Multi-Session Drift Check
When multiple agent sessions run in parallel (especially with worktrees), files drift out
of sync. This skill scans for inconsistencies and proposes fixes.
**Invocation:** deliberately model-invocable — the scan is read-only and auto-triggering
on a drift smell is the point. Anything that changes files is proposed, never applied.
## Configuration
Read the optional `workspace.yaml` at the project root for where state lives. Below,
`<state_dir>` and `<task_file>` are its resolved values; defaults are `state/` and
`TODO.md`. Full reference: `docs/state-model.md`.
## When to Use
- After merging worktree branches back to the default branch
- When something "feels off" after parallel work
- After a crash where multiple sessions were open
- As a periodic sanity check during heavy parallel workflows
## Instructions
### 0. Detect the default branch
```bash
git rev-parse --git-dir >/dev/null 2>&1 || { echo "not a git repository — nothing to reconcile"; exit 0; }
DEFAULT=$(git symbolic-ref --short refs/remotes/origin/HEAD 2>/dev/null | sed 's|^origin/||')
DEFAULT=${DEFAULT:-$(git remote show origin 2>/dev/null | sed -n 's/.*HEAD branch: //p')}
DEFAULT=${DEFAULT:-main} # no remote configured — fall back and say so in the report
```
### 1. Scan recent commit history across all branches
```bash
git log --all --oneline --since="24 hours ago" --graph
```
Look for:
- Multiple branches touching the same files
- Commits on branches that hav