Commit Graph

17 Commits

Author SHA1 Message Date
a9043d154d Rework squash command to collapse commits in-place
Instead of squash-merging into main, `sandlot squash` now soft-resets
to the merge base and recommits, keeping the branch independent.
This removes the --force flag and all squash-merge logic from
mergeAndClose, which goes back to being a plain merge.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-10 08:07:51 -07:00
97a6a2632a Improve commit message prompts and use Opus model 2026-03-15 23:13:40 -07:00
90bb8da28e Add progress indicator to conflict resolution 2026-03-13 13:47:07 -07:00
6d86a988f7 Track activity markers during merge/rebase 2026-03-11 22:13:55 -07:00
e8318f68b0 Remove unused readdir import, simplify rmdir loop 2026-03-09 12:49:13 -07:00
385673f420 Refactor symlink removal into unlinkSessionSymlink helper 2026-03-09 12:04:04 -07:00
7e9d372d96 Show current branch name in merge success message 2026-02-27 07:59:46 -08:00
392d3c787b add --force flag to merge and squash commands 2026-02-27 07:48:21 -08:00
920b4d12b4 Add pre-merge validation in mergeAndClose 2026-02-27 07:45:09 -08:00
7ebbfad8f2 Add ensureSession to recreate missing worktrees 2026-02-26 19:26:24 -08:00
c85af793cd Refactor teardown logic into shared helper 2026-02-26 19:26:24 -08:00
1d7f60b50c Simplify commit message prompts to single-line format
Change the commit message generation prompts from requesting
50/72-rule multi-line messages to single-line subjects only.
This avoids unnecessary body text in automated commits and
ensures the first line is always used via `.split("\n")[0]`.
2026-02-23 20:35:43 -08:00
c6ef48384e Improve commit message generation to follow 50/72 rule 2026-02-23 20:06:41 -08:00
1022a75722 Improve merge spinner messages and conflict resolution flow 2026-02-23 19:20:37 -08:00
31df93016b Refactor merge/squash into shared mergeAndClose helper with AI-generated squash commit messages 2026-02-21 08:54:58 -08:00
603c92b595 refactor conflict resolution into shared helper and add rebase round limit 2026-02-20 18:54:25 -08:00
14cad28488 Refactor cli.ts into per-command modules with shared utilities 2026-02-20 15:43:15 -08:00