16 Commits

Author	SHA1	Message	Date
Chris Wanstrath	668f66d3c9	Add squash-merge command with conflict resolution	2026-02-21 08:39:37 -08:00
Chris Wanstrath	0932fd5ef5	Rename spinner variables and add rebase-in-progress guard with improved error messages	2026-02-20 20:12:44 -08:00
Chris Wanstrath	0c5e44bb5d	Add rebase command with AI-assisted conflict resolution	2026-02-20 16:01:26 -08:00
Chris Wanstrath	14cad28488	Refactor cli.ts into per-command modules with shared utilities	2026-02-20 15:43:15 -08:00
Chris Wanstrath	814bbb39a0	Make worktree removal idempotent by pruning and cleaning up stale directories instead of throwing on failure	2026-02-20 07:41:24 -08:00
Chris Wanstrath	be29b5fcd7	die more gracefully	2026-02-20 07:40:24 -08:00
Chris Wanstrath	c76340777e	add status icons to list command showing session activity state	2026-02-19 12:35:23 -08:00
Chris Wanstrath	3bcea58729	Consolidate close action logs into a single summary message	2026-02-19 11:17:07 -08:00
Chris Wanstrath	2a90c59b3b	diff: show uncommitted changes or full branch diff vs main when working tree is clean	2026-02-19 10:14:11 -08:00
Chris Wanstrath	8cbeede82b	Auto-resolve merge conflicts using Claude when merging branches	2026-02-19 09:50:01 -08:00
Chris Wanstrath	cedf6705ef	sandlot merge <branch> ... Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-17 19:13:11 -08:00
Chris Wanstrath	4cb3b10047	error handling	2026-02-17 09:57:44 -08:00
Chris Wanstrath	994c26647d	updates	2026-02-17 08:52:07 -08:00
Chris Wanstrath	6f6d921c54	simplify	2026-02-17 07:57:24 -08:00
Chris Wanstrath	033331db98	updates	2026-02-16 20:22:44 -08:00
Chris Wanstrath	5d7bf302f2	Add sandlot CLI for branch-based dev with worktrees and Apple containers ... Implements all 7 commands: new, save, push, list, open, stop, rm. Uses Commander for CLI parsing, Anthropic SDK for AI commit messages and merge conflict resolution, and Apple container for VMs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-16 20:15:29 -08:00