reconcile

/reconcile — Ground Truth, Then Commit, Push, and Open the PR

Read the repo's real state before acting on it: a branch that shifted, a push that did not land, or another session mid-merge will burn a whole session if you assume instead of check. Once the state is known, /reconcile carries the work through to an open PR and back to an up-to-date default branch.

What it does

Snapshots the full git state in one pass, detects a concurrent writer, classifies the upstream relationship, then acts only on the known state — stopping at every operation that is hard to reverse. When work is ready, it stages by filename, commits one concern, pushes a feature branch, verifies the push landed, and opens a PR. After a human merges, it fast-forwards the default branch and checks it out. Backed by the reconcile skill.

Establish ground truth

One command, cross-platform, no shell required:

npx ci-reconcile              # resolved-state block; exit 0 clear / 1 blocked / 2 not a repo
npx ci-reconcile --json       # machine-readable
npx ci-reconcile --explain    # the probe set and why each probe runs

The same pass by hand. src/lib/git-state.mts is the source of truth for this list, and npm run verify:reconcile-parity fails if this file drifts from it:

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; 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