reconcile

Reconcile — Ground Truth, Then Commit, Push, and Open the PR

Law 1 says research before executing. The most expensive skipped research is the state of your own repo: a branch that shifted under you, a push that silently did not land, a stash from a session you forgot. This skill establishes git ground truth first, acts only on a known state, stops at every operation that is hard to reverse, and then carries that known-good state all the way through a single-concern commit, a push, and an open PR — ending back on an up-to-date default branch once the PR merges.

When to Activate

• Before any branch/merge/rebase/push when more than one session, loop, or agent may be writing to the tree.
• When the working tree looks different from what you expect (unexpected branch, surprise modifications, a half-finished merge).
• Before cleaning up: consolidating branches, dropping stashes, removing worktrees.
• When finished work needs to land: stage it, commit one concern, push a feature branch, open a PR, and return to an up-to-date default branch.
• After a push, to confirm it actually landed on the remote.

Establish Ground Truth First

Read before you write. One command runs the whole pass and prints the resolved-state block:

npx ci-reconcile              # resolved-state block; exit 1 if anything blocks a mutation
npx ci-reconcile --json       # the same state, machine-readable
npx ci-reconcile --explain    # print the probe set and why each probe runs

Exit codes: 0 nothing blocks, 1 at least one blocker, 2 not a git repository. The probe set is defined once in src/lib/git-state.mts, and npm run verify:reconcile-parity fails if this document drifts from it — the list below is the list the runner executes.

Run the pass by hand when the runner is not installed:

git rev-parse --show-toplevel                          # inside a work tree, and where
git rev-parse HEAD                                     # the sha every later claim is relative to
git symbolic-ref --quiet --short HEAD                  # branch name; NON-ZERO EXIT = detached HEAD
git rev-parse --abbrev-ref --symbolic-full-name @{u}   # upstream, or non-zero = none configured
git rev-list --left-right --count @{u}...HEAD          # behind/ahead — only after the line above succeeded
git status --porcelain=v1                              # reported changes (inflated by autocrlf)
git diff --name-only --ignore-all-space                # real content drift — the number to trust
git stash list
git worktree list --porcelain
git rev-parse --git-path MERGE_HEAD                    # in-progress op: test the RESOLVED path for existence