Skip to content

Conversation

gunta
Copy link

@gunta gunta commented Jul 9, 2025

Summary

This PR implements Jujutsu support in moon as described in #2047, enabling AI agents and developers to work in parallel across multiple workspaces without conflicts.

  • ✅ Added Jujutsu as a new VCS backend option alongside Git
  • ✅ Implemented full VCS trait for Jujutsu operations
  • ✅ Added support for Jujutsu workspaces with multi-workspace operations
  • ✅ Updated configuration schemas and documentation
  • ✅ Added example configuration for Jujutsu usage

Configuration

To use Jujutsu instead of Git, update your .moon/workspace.yml:

vcs:
  manager: 'jj'
  defaultBranch: 'main'

Features

  • Basic VCS Operations: All standard moon VCS operations work with Jujutsu
  • Multi-Workspace Support: Run tasks across multiple Jujutsu workspaces simultaneously
  • Conflict Detection: Detect and handle conflicts between workspaces
  • Git Backend Compatibility: Works seamlessly with Jujutsu's Git backend

Implementation Details

  • New Jujutsu struct implementing the Vcs trait
  • JujutsuWorkspaceExt trait for workspace-specific operations
  • JujutsuMultiWorkspace for managing operations across all workspaces
  • Maps Jujutsu concepts (changes, revsets) to moon's VCS model

Test Plan

  • Unit tests for Jujutsu VCS operations (pending sandbox API updates)
  • Integration tests with real Jujutsu repositories
  • Multi-workspace task execution tests
  • Conflict detection and handling tests

Notes

This is a draft PR for initial review. Tests are temporarily commented out pending updates to the sandbox API to support Jujutsu commands.

Closes #2047

🤖 Generated with Claude Code

- Add Jujutsu as a new VCS backend option alongside Git
- Implement full VCS trait for Jujutsu operations
- Add support for Jujutsu workspaces with multi-workspace operations
- Update configuration schemas and documentation
- Add example configuration for Jujutsu

Configure with `vcs.manager: 'jj'` in workspace configuration.
Supports all moon VCS operations including touched files detection,
file hashing, and change tracking.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
@milesj
Copy link
Collaborator

milesj commented Jul 9, 2025

@gunta Awesome stuff, before I review, can you change the base to the develop-1.39 branch.

@gunta
Copy link
Author

gunta commented Jul 10, 2025

Sure!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

[feature] Enable AI agents to truly code in parallel: Jujutsu workspace support
2 participants