Commit Graph

33 Commits

Author SHA1 Message Date
ec1f6796b8 Add edit command to open session files in $EDITOR 2026-02-23 19:14:58 -08:00
b46511efe3 Rename info to neofetch in vm module and command handler 2026-02-23 08:08:59 -08:00
33e47a802c Move retry logic into vm.ts and simplify open.ts command flow 2026-02-23 08:06:58 -08:00
6114540764 Return exit code and output from claude() and retry without --continue on failure 2026-02-23 07:32:42 -08:00
2eba71ce87 Merge branch 'difftastic-integration' 2026-02-22 07:47:11 -08:00
4cde0c2086 Use inherited stdio for git diff/show to support external diff tools and native paging 2026-02-22 07:31:30 -08:00
c2cf0518e7 open: pass continue flag when running prompt in print mode 2026-02-21 12:29:16 -08:00
cfb9ed6172 Pass continue: true to claude when opening an existing session 2026-02-21 12:27:37 -08:00
a5fb4c2555 Merge branch 'sandlot-squash'
# Conflicts:
#	src/commands/merge.ts
2026-02-21 08:56:32 -08:00
18de3a4164 missing join 2026-02-21 08:56:19 -08:00
31df93016b Refactor merge/squash into shared mergeAndClose helper with AI-generated squash commit messages 2026-02-21 08:54:58 -08:00
47a6107f76 Merge branch 'cache-packages' 2026-02-21 08:54:14 -08:00
daf436f90e Merge branch 'improve-conflict-context'
# Conflicts:
#	src/commands/merge.ts
2026-02-21 08:53:45 -08:00
cfe8eab054 add vm uncache command to clear the package cache 2026-02-21 08:53:06 -08:00
db9f40dac9 improve conflict complexity analysis and merge error messaging 2026-02-21 08:46:58 -08:00
668f66d3c9 Add squash-merge command with conflict resolution 2026-02-21 08:39:37 -08:00
376f918a66 refactor merge: extract lineCount helper, hoist preamble, and gracefully handle git errors 2026-02-21 08:36:44 -08:00
1e71b3b4a4 Require session to exist before closing; simplify worktree path resolution 2026-02-21 08:31:08 -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
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
0c5e44bb5d Add rebase command with AI-assisted conflict resolution 2026-02-20 16:01:26 -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