intuitive-squash

Intuitive Squash

Turn noisy local agent history into a small set of meaningful commits without changing the final tree. After an optional fetch, keep planning free of worktree and local-branch mutations. Never rewrite history until the user approves the exact plan and its risk gates.

Resolve The Base

If the user gives a base ref, verify it and use its merge base with HEAD. Otherwise inspect:

git fetch --prune --all
git branch --show-current
git rev-parse --abbrev-ref --symbolic-full-name @{upstream}
git remote show origin
git for-each-ref --sort=-committerdate \
  --format='%(refname:short) %(committerdate:short) %(subject)' \
  refs/remotes/origin
git branch -vv
gh pr view --json baseRefName,headRefName,url

Continue with local evidence if fetch or GitHub CLI access is unavailable, and say what is missing. Rank candidates by:

1. the open PR base;
2. a configured upstream only when it is an integration branch rather than the current branch's push target;
3. the remote default branch, unless stale;
4. active long-lived branches such as dev, develop, trunk, or a release branch that plausibly contains the branch point;
5. main or master only when no stronger evidence exists.

For plausible candidates compare merge base, branch commit count, and latest commit date. Ask Use <recommended-base> as the squash base, or should I use another ref? when the evidence is ambiguous, the recommendation is not the remote default, the default looks stale, the upstream is the branch's own remote counterpart, or the commit count changes materially. Do not analyze or plan groups until the base is explicit.

Run Read-Only Preflight

After resolving the base, run:

bun <intuitive-squash-skill-root>/scripts/preflight.ts <base-ref> \
  --remote-default <remote/default-branch>

The report inventories the exact merge base and HEAD, dirty and untracked state, upstream divergence, remote publication, merges, signatures, tags, authors, changed paths, and deterministic preservation reasons. Treat the reported HEAD as the planned head; rerun preflight if it changes before execution. Omit --remote-default only when discovery could not identify one; the script otherwise falls back to a local origin/HEAD symbolic ref. Exit 3 means the report contains a hard stop, not that its read-only probes failed.