feat(server): jj-native checkpoints and review diffs - #11382
Draft
THEjacob1000 wants to merge 588 commits into
Draft
THEjacob1000 wants to merge 588 commits into
THEjacob1000 wants to merge 588 commits into
Conversation
This was referenced Sep 12, 2026
github-actions
Bot
added
vouch:unvouched
THEjacob1000
force-pushed
the
feat/jj-checkpoints
branch
from
September 12, 2026 06:25
3967208 to
ef10951
Compare
juliusmarminge
force-pushed
the
t3code/codex-turn-mapping
branch
2 times, most recently
from
September 14, 2026 21:15
a8cc38b to
834edb9
Compare
THEjacob1000
force-pushed
the
feat/jj-checkpoints
branch
2 times, most recently
from
September 14, 2026 23:49
94c46a6 to
83185ae
Compare
juliusmarminge
force-pushed
the
t3code/codex-turn-mapping
branch
4 times, most recently
from
September 15, 2026 17:25
a5ebe9a to
a62d7ad
Compare
THEjacob1000
force-pushed
the
feat/jj-checkpoints
branch
from
September 15, 2026 21:45
83185ae to
5aaf8aa
Compare
juliusmarminge
force-pushed
the
t3code/codex-turn-mapping
branch
6 times, most recently
from
September 16, 2026 21:15
0f32464 to
4ab2efc
Compare
THEjacob1000
force-pushed
the
feat/jj-checkpoints
branch
from
September 16, 2026 21:22
5aaf8aa to
b28fa51
Compare
juliusmarminge
force-pushed
the
t3code/codex-turn-mapping
branch
8 times, most recently
from
September 18, 2026 00:54
7e67512 to
48b7f3f
Compare
juliusmarminge
force-pushed
the
t3code/codex-turn-mapping
branch
from
September 19, 2026 04:23
5ff0a93 to
fd8ea2f
Compare
…g#12491) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…d vcs kind contracts
THEjacob1000
force-pushed
the
feat/jj-checkpoints
branch
from
September 20, 2026 22:24
b28fa51 to
4a2476c
Compare
juliusmarminge
force-pushed
the
t3code/codex-turn-mapping
branch
12 times, most recently
from
September 25, 2026 05:55
fe4f6ad to
87c67bd
Compare
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Changed
Checkpoints and review diffs for jj repos. A checkpoint is the commit id of
@at the end of a turn, pinned underrefs/t3/like git. Restore isjj restore --from, so change ids, bookmarks and other workspaces survive andjj undotakes it back. Review diffs run git plumbing against the colocated store so the diff parsers don't change.Why
Bookmarks show up in the ref picker,
jj commitdrops a visible commit in the user's log every turn, and op ids stop resolving once the op log is pruned. A raw ref is durable, invisible and moves nothing. After a prune jj forgets the object but git still has it, so restore imports it back through a temp bookmark.Stack
GitHub can't create stacked PRs from a fork, so the diff carries the PRs below. Review the top commit only.
Manual evidence
Manually exercised in the installed Linux desktop app, build
2a249f8e503a(the complete stack), using disposable repositories. These captures verify the integrated stack, not each lower PR in isolation.Two real agent turns produced distinct file diffs. The baseline and both turn checkpoints retain the same jj change ID;
mainstays on the original commit. A separate workspace also produced a turn diff. Working-copy and bookmark review were exercised after a selected-file commit.Restore was rechecked in an isolated dev instance. Reverting the second turn restores the first checkpoint on disk and returns the removed prompt to the composer. Undo, pruned-object recovery, conflicts and large-file cases remain untested.
Two turn diffs, checkpoint identity and restore
restore-verified.mp4
Checklist
Evidence captured with Codex; test turns used GPT-6 Astra.