Commit Graph

198 Commits

Author SHA1 Message Date
ca7af3d671 Remove difftastic from tooling installation and cache 2026-02-21 08:31:02 -08:00
c6b6f52b1f skip complex conflicts in merge auto-resolution 2026-02-21 08:30:51 -08:00
4db29e4beb Add --install flag to completions command that outputs an install script 2026-02-21 08:26:44 -08:00
4f913b6091 Add tooling cache and install neofetch, difftastic, and Neovim in containers 2026-02-21 08:24:26 -08:00
12ba2c7c82 Merge branch 'sandlot-rebase' 2026-02-21 07:54:44 -08:00
386954b3c4 Truncate large diffs in merge context and add error handling to git log/diff helpers 2026-02-21 07:54:23 -08:00
2722761125 truncate prompt display to first line only 2026-02-21 07:53:52 -08:00
cc1d2628a9 Replace newlines with spaces in prompt display 2026-02-21 07:51:20 -08:00
0932fd5ef5 Rename spinner variables and add rebase-in-progress guard with improved error messages 2026-02-20 20:12:44 -08:00
ae6604caad add merge context (branch log, diff stats, per-file diffs) to improve conflict resolution quality 2026-02-20 19:21:16 -08:00
ed43aaff78 Merge branch 'sandlot-rm-completion' 2026-02-20 19:19:25 -08:00
76797569e1 Hide rm alias from help while keeping it in completions 2026-02-20 18:55:24 -08:00
603c92b595 refactor conflict resolution into shared helper and add rebase round limit 2026-02-20 18:54:25 -08:00
e88de1aed3 save changes after review completes 2026-02-20 18:41:36 -08:00
37665aac58 Unhide rm command and add description as alias for close 2026-02-20 16:27:43 -08:00
0c5e44bb5d Add rebase command with AI-assisted conflict resolution 2026-02-20 16:01:26 -08:00
71830c6bd5 Merge branch 'code-review'
# Conflicts:
#	src/cli.ts
2026-02-20 15:56:35 -08:00
8d31e9ec68 Remove REVIEW.md, standardize close.ts export, and minor cleanup 2026-02-20 15:55:54 -08:00
14cad28488 Refactor cli.ts into per-command modules with shared utilities 2026-02-20 15:43:15 -08:00
59c90fa812 Merge branch 'markdown-links' 2026-02-20 15:22:13 -08:00
b4b72e2c02 fix markdown rendering: protect code blocks/escapes, move links before bold/italic, add task lists and H2-H6 support 2026-02-20 15:22:09 -08:00
89127f98c8 Pass --continue flag when resuming existing sessions 2026-02-20 15:17:07 -08:00
ecf7b93f3f Add OSC 8 terminal hyperlink rendering for markdown links 2026-02-20 12:21:12 -08:00
3c1f42e985 Merge branch 'test-markdown' 2026-02-20 12:17:17 -08:00
a1e543057f Refactor markdown test to read from file instead of hardcoded strings 2026-02-20 12:17:10 -08:00
7732a3136e Merge branch 'auto-list' 2026-02-20 12:16:34 -08:00
cc3793593d Show session list by default when sessions exist 2026-02-20 12:16:18 -08:00
0ad173ef8f Add heading and blockquote rendering to markdown formatter 2026-02-20 09:00:49 -08:00
1f6c392167 Add markdown test document covering common syntax features 2026-02-20 08:55:04 -08:00
3e423a3b37 Strip code fences from markdown rendering in terminal output 2026-02-20 08:45:28 -08:00
7c5746e268 add fish shell completions command 2026-02-20 08:40:56 -08:00
c67c89f4f7 add fish shell completions for sandlot 2026-02-20 08:32:18 -08:00
267b519e14 Add --force flag to close command and guard against unsaved changes 2026-02-20 08:28:39 -08:00
7c46b28aab Add dirty worktree check before merge to prevent unsaved changes from being lost 2026-02-20 08:27:34 -08:00
9b8d4d882e Set explicit PATH in shell container exec 2026-02-20 08:25:24 -08:00
601170e2ab Merge branch 'claude-markdown' 2026-02-20 07:58:40 -08:00
f6bc2aecb7 render markdown output for claude command results; add blank line before lists in markdown renderer 2026-02-20 07:58:27 -08:00
59fcb55eb4 Merge branch 'launch-claude-vm' 2026-02-20 07:55:39 -08:00
e00d1f7d5b Swap active/saved colors in session list (cyan for active, green for saved) 2026-02-20 07:54:01 -08:00
de40ddd225 Make the branch argument optional in the shell command, falling back to a plain VM shell when omitted 2026-02-20 07:47:49 -08:00
10c6bd46a0 Add PATH to container exec environment for claude binary 2026-02-20 07:47:40 -08:00
5beb35dbe2 Change inline code color to light purple and add markdown test script 2026-02-20 07:47:31 -08:00
ef8e40ecb3 add sandlot shell <branch> command to open a shell in a session's worktree 2026-02-20 07:44:43 -08:00
f00cea588f Merge branch 'cleanup' 2026-02-20 07:41:41 -08:00
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
be29b5fcd7 die more gracefully 2026-02-20 07:40:24 -08:00
1cd4e7f668 add cleanup command to remove stale sessions with missing worktrees 2026-02-20 07:40:02 -08:00
3888876ed5 add unzip 2026-02-20 07:38:24 -08:00
5dd0ff2193 dont think bun.$ can do env vars 2026-02-20 07:31:57 -08:00
773e8d56a4 ~/.local/bin for bun 2026-02-19 20:15:42 -08:00