Skip to content

feat(vcs): jj driver, detection and process wrapper - #11373

Closed
THEjacob1000 wants to merge 587 commits into
pingdotgg:t3code/codex-turn-mappingfrom
THEjacob1000:feat/jj-support
Closed

THEjacob1000 wants to merge 587 commits into
pingdotgg:t3code/codex-turn-mappingfrom
THEjacob1000:feat/jj-support

Conversation

@THEjacob1000

@THEjacob1000 THEjacob1000 commented Sep 12, 2026 •

Copy link
Copy Markdown

What Changed

Bottom of a 4 PR stack for colocated jj: this, then #11382, #11383, #11384. A JjVcsDriver behind the existing VcsDriverRegistry, detected before git when the nearest marker is .jj, plus the JjProcess wrapper, availability check (floor jj 0.42.0), repo path resolution and a vcs.kind field on local status. CI gets a setup-jj action.

Why

The reopen Julius asked for on #2461, on the VcsDriver foundation from #2435 rather than a parallel subsystem like #743 and #1796. jj owns the working copy, the colocated .git stays the object store, so diffs and hosting don't fork. A jj repo with no reachable .git is reported unusable, not treated as git. Every jj call sets git.abandon-unreachable-commits=false so a status poll can't abandon commits.

Nothing routes to the driver yet. Closes #1126 as a stack.

Stack

  1. This PR
  2. feat(server): jj-native checkpoints and review diffs #11382
  3. feat(server): route workflow, hosting glue, and discovery by vcs kind #11383
  4. feat(web,mobile): jj terminology and shared vcs action logic #11384

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.

Discovery/rescan reports Jujutsu available. A colocated repo gets bookmark controls; a non-colocated repo disables actions with the colocation explanation. Missing/old binaries, nested-repo precedence and config overrides are still untested.

Discovery and unsupported repository

Git and Jujutsu availability after rescan

Non-colocated Jujutsu repository shows the unsupported reason

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Evidence captured with Codex; test turns used GPT-6 Astra.

@github-actions github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XXL 1,000+ changed lines (additions + deletions). labels Sep 12, 2026
@THEjacob1000
THEjacob1000 force-pushed the feat/jj-support branch 2 times, most recently from 303457f to c000929 Compare September 12, 2026 06:07
@THEjacob1000 THEjacob1000 changed the title feat(vcs): first-class jujutsu support for colocated repos feat(vcs): jj driver, detection and process wrapper Sep 12, 2026
@omarshaarawi

Copy link
Copy Markdown

hey @THEjacob1000 , I'd love to help out on this to get it across the line but should you not wait on #2829 to merge before any work is done? unless your base is based on that branch then I only see this being throwaway work.

@THEjacob1000

THEjacob1000 commented Sep 14, 2026 •

Copy link
Copy Markdown
Author

@omarshaarawi yeah there's like 4 PRs to get this over the line (so I'm not just merging a 12k line PR into an open source project). This one is the only one that doesn't conflict with that existing PR (the other 3 are stacked on top of 2829).

EDIT: Even though it wasn't going to conflict and could actually still be based on main, it makes more sense to have all 4 PRs in the same stack from the same branch (and WAY easier to track)

@THEjacob1000
THEjacob1000 changed the base branch from main to t3code/codex-turn-mapping September 14, 2026 22:22
@THEjacob1000
THEjacob1000 marked this pull request as ready for review September 14, 2026 22:52
@cursor

cursor Bot commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

@THEjacob1000

Copy link
Copy Markdown
Author

@juliusmarminge fresh take on jj against V2, following your close note on #2461. It's stacked on t3code/codex-turn-mapping (cumulative diffs coz GitHub won't stack from a fork) so it tracks V2 rather than waiting for the merge. Happy to retarget main once #2829 lands if it's preferable to be reviewed from there.

@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch 4 times, most recently from a5ebe9a to a62d7ad Compare September 15, 2026 17:25
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch 6 times, most recently from 0f32464 to 4ab2efc Compare September 16, 2026 21:15
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from 43db598 to 6f6817f Compare September 17, 2026 06:24
@juliusmarminge
juliusmarminge force-pushed the t3code/codex-turn-mapping branch from 5ff0a93 to fd8ea2f Compare September 19, 2026 04:23
@t3dotgg

t3dotgg commented Oct 1, 2026

Copy link
Copy Markdown
Member

Note

🤖 GPT-6 Astra responding on behalf of Theo

We're closing this as part of a cleanup of old PRs. Thank you for the time and care you put into this contribution.

The current comparison includes 1,477 files and 478,596 changed lines, with conflicts in 546 files against the target branch. Much of that comparison comes from diverged base history, beyond the change described here. The latest implementation commit is from 2026-09-20.

At this point, regenerating a focused patch against the current intended base would be easier to review and maintain than updating this PR. We appreciate the problem report and the work already done; this thread will remain available as a reference. If you revisit it, please confirm the current direction with us and link a fresh, focused PR back here.

@t3dotgg t3dotgg closed this Oct 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL 1,000+ changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature]: Jujutsu VCS support