Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Add VCS-agnostic workspace abstraction with jj support

Maximilian Roosc4259247fa1e
diff --git a/src/commands/handle_merge_jj.rs b/src/commands/handle_merge_jj.rs
index 45db97e4a..d962c4cae 100644
--- a/src/commands/handle_merge_jj.rs
+++ b/src/commands/handle_merge_jj.rs
@@ -72,9 +72,9 @@ pub fn handle_merge_jj(opts: MergeOptions<'_>) -> anyhow::Result<()> {
false
};
- // Target bookmark name — detect from trunk() or use explicit override
- let detected_target = workspace.trunk_bookmark()?;
- let target = opts.target.unwrap_or(detected_target.as_str());
+ // Target bookmark name — detect from config/trunk()/local bookmarks, or use explicit override
+ let resolved_target = workspace.resolve_integration_target(opts.target)?;
+ let target = resolved_target.as_str();
// Check if already integrated
let feature_tip = workspace.feature_tip(&ws_path)?;
@@ -142,6 +142,14 @@ pub fn handle_merge_jj(opts: MergeOptions<'_>) -> anyhow::Result<()> {
)?;
}
+ // Push (best-effort — may not have a git remote)
+ match workspace.advance_and_push(target, &ws_path, Default::default()) {
+ Ok(result) if result.commit_count > 0 => {
+ eprintln!("{}", success_message(cformat!("Pushed <bold>{target}</>")));
+ }
+ _ => {}
+ }
+
let mode = if squash { "Squashed" } else { "Merged" };
eprintln!(
"{}",
diff --git a/src/workspace/jj.rs b/src/workspace/jj.rs
index 1513b04a1..6671aeec5 100644
--- a/src/workspace/jj.rs
+++ b/src/workspace/jj.rs
@@ -75,8 +75,9 @@ impl JjWorkspace {
/// Detect the bookmark name associated with `trunk()`.
///
- /// Falls back to `"main"` if no bookmark is found.
- pub fn trunk_bookmark(&self) -> anyhow::Result<String> {
+ /// Returns `None` if no bookmarks are found on the `trunk()` revset
+ /// (common in local-only repos without remote tracking).
+ fn trunk_bookmark(&self) -> anyhow::Result<Option<String>> {
let output = self.run_command(&[
"log",
"-r",
@@ -89,17 +90,31 @@ impl JjWorkspace {
// Prefer "main", then "master", then first found
if bookmarks.contains(&"main") {
- Ok("main".to_string())
+ Ok(Some("main".to_string()))
} else if bookmarks.contains(&"master") {
- Ok("master".to_string())
+ Ok(Some("master".to_string()))
} else {
- Ok(bookmarks
- .first()
- .map(|s| s.to_string())
- .unwrap_or_else(|| "main".to_string()))
+ Ok(bookmarks.first().map(|s| s.to_string()))
}
}
+ /// Check if common default branch bookmarks ("main", "master") exist locally.
+ ///
+ /// Used as a fallback when `trunk()` doesn't resolve to a bookmark (e.g.,
+ /// local-only repos without remote tracking).
+ fn find_local_default_bookmark(&self) -> Option<String> {
+ let output = self
+ .run_command(&["bookmark", "list", "-T", r#"name ++ "\n""#])
+ .ok()?;
+ let bookmarks: Vec<&str> = output.lines().filter(|l| !l.is_empty()).collect();
+ for candidate in ["main", "master"] {
+ if bookmarks.contains(&candidate) {
+ return Some(candidate.to_string());
+ }
+ }
+ None
+ }
+
/// Determine the feature tip change ID.
///
/// In jj, the working copy (@) is often an empty auto-snapshot commit.
@@ -271,8 +286,12 @@ impl Workspace for JjWorkspace {
{
return Some(name);
}
- // Fall back to trunk() revset detection
- self.trunk_bookmark().ok()
+ // Fall back to trunk() revset detection (requires remote bookmarks)
+ if let Some(name) = self.trunk_bookmark().ok().flatten() {
+ return Some(name);
+ }
+ // Local-only repos: check if common default branch bookmarks exist
+ self.find_local_default_bookmark()
}
fn set_default_branch(&self, name: &str) -> anyhow::Result<()> {
@@ -362,7 +381,9 @@ impl Workspace for JjWorkspace {
fn resolve_integration_target(&self, target: Option<&str>) -> anyhow::Result<String> {
match target {
Some(t) => Ok(t.to_string()),
- None => self.trunk_bookmark(),
+ None => self.default_branch_name().ok_or_else(|| {
+ anyhow::anyhow!("Cannot determine default branch. Specify target explicitly or run: wt config state default-branch set BRANCH")
+ }),
}
}
diff --git a/src/workspace/mod.rs b/src/workspace/mod.rs
index 8fccfd3f3..da9f3dcdb 100644
--- a/src/workspace/mod.rs
+++ b/src/workspace/mod.rs
@@ -159,7 +159,7 @@ pub trait Workspace: Send + Sync {
/// Resolve the integration target (branch/bookmark to rebase onto).
/// Git: validates ref exists, falls back to default branch.
- /// Jj: detects trunk bookmark.
+ /// Jj: uses `default_branch_name()` detection chain (config, trunk, local bookmarks).
fn resolve_integration_target(&self, target: Option<&str>) -> anyhow::Result<String>;
/// Whether the current workspace is already rebased onto `target`.
diff --git a/tests/integration_tests/jj.rs b/tests/integration_tests/jj.rs
index 8569e696d..28614d96e 100644
--- a/tests/integration_tests/jj.rs
+++ b/tests/integration_tests/jj.rs
@@ -1284,8 +1284,8 @@ fn test_jj_switch_default_from_default(jj_repo: JjTestRepo) {
assert_cmd_snapshot!(make_jj_snapshot_cmd(&jj_repo, "switch", &["default"], None));
}
-/// Merge with implicit target (no argument) — exercises trunk_bookmark() resolution
-/// (workspace/jj.rs resolve_integration_target(None) → trunk_bookmark()).
+/// Merge with implicit target (no argument) — exercises default branch detection
+/// (resolve_integration_target(None) → default_branch_name()).
#[rstest]
fn test_jj_merge_implicit_target(jj_repo_with_feature: JjTestRepo) {
assert_cmd_snapshot!(make_jj_snapshot_cmd(
diff --git a/tests/snapshots/integration__integration_tests__jj__jj_merge_implicit_target.snap b/tests/snapshots/integration__integration_tests__jj__jj_merge_implicit_target.snap
index f8a933192..4d3728956 100644
--- a/tests/snapshots/integration__integration_tests__jj__jj_merge_implicit_target.snap
+++ b/tests/snapshots/integration__integration_tests__jj__jj_merge_implicit_target.snap
@@ -30,5 +30,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
+✓ Pushed main
✓ Squashed workspace feature into main
✓ Removed workspace feature @ _REPO_.feature
diff --git a/tests/snapshots/integration__integration_tests__jj__jj_merge_no_remove.snap b/tests/snapshots/integration__integration_tests__jj__jj_merge_no_remove.snap
index b8b998d85..a5a5d1822 100644
--- a/tests/snapshots/integration__integration_tests__jj__jj_merge_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__jj__jj_merge_no_remove.snap
@@ -21,10 +21,10 @@ info:
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
- WT_TEST_DELAYED_STREAM_MS: "-1"
- WT_TEST_EPOCH: "1735776000"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -32,5 +32,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
+✓ Pushed main
✓ Squashed workspace feature into main
○ Workspace preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__jj__jj_merge_squash.snap b/tests/snapshots/integration__integration_tests__jj__jj_merge_squash.snap
index abec55ea9..6fd1be3dd 100644
--- a/tests/snapshots/integration__integration_tests__jj__jj_merge_squash.snap
+++ b/tests/snapshots/integration__integration_tests__jj__jj_merge_squash.snap
@@ -20,10 +20,10 @@ info:
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
- WT_TEST_DELAYED_STREAM_MS: "-1"
- WT_TEST_EPOCH: "1735776000"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -31,5 +31,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
+✓ Pushed main
✓ Squashed workspace feature into main
✓ Removed workspace feature @ _REPO_.feature
diff --git a/tests/snapshots/integration__integration_tests__jj__jj_merge_squash_with_directive_file.snap b/tests/snapshots/integration__integration_tests__jj__jj_merge_squash_with_directive_file.snap
index 0e2ce6111..88019fe79 100644
--- a/tests/snapshots/integration__integration_tests__jj__jj_merge_squash_with_directive_file.snap
+++ b/tests/snapshots/integration__integration_tests__jj__jj_merge_squash_with_directive_file.snap
@@ -21,10 +21,10 @@ info:
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
- WT_TEST_DELAYED_STREAM_MS: "-1"
- WT_TEST_EPOCH: "1735776000"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -32,5 +32,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
+✓ Pushed main
✓ Squashed workspace feature into main
✓ Removed workspace feature @ _REPO_.feature
diff --git a/tests/snapshots/integration__integration_tests__jj__jj_step_squash_already_integrated.snap b/tests/snapshots/integration__integration_tests__jj__jj_step_squash_already_integrated.snap
index 55b875536..ae294bf39 100644
--- a/tests/snapshots/integration__integration_tests__jj__jj_step_squash_already_integrated.snap
+++ b/tests/snapshots/integration__integration_tests__jj__jj_step_squash_already_integrated.snap
@@ -31,4 +31,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-○ Nothing to squash; already a single commit
+○ Nothing to squash; no commits ahead of main