fix(sync): drop local merged parents before cleanup

Author: mark-pro

src/core/sync.rs

@@ -7,8 +7,9 @@ use crate::core::deleted_local;
 use crate::core::gh::{self, PullRequestState, PullRequestStatus};
 use crate::core::graph::BranchGraph;
 use crate::core::restack::{self, RestackAction, RestackPreview};
+use crate::core::store::types::DigState;
 use crate::core::store::{
-    BranchNode, PendingOperationKind, PendingOperationState, PendingSyncOperation,
+    BranchNode, ParentRef, PendingOperationKind, PendingOperationState, PendingSyncOperation,
     PendingSyncPhase, clear_operation, load_operation, open_initialized,
 };
 use crate::core::workflow;
@@ -256,8 +257,10 @@ fn run_full_sync() -> io::Result<SyncOutcome> {
     } else {
         Vec::new()
     };
-
     let original_branch = git::current_branch_name()?;
+    if remote_sync_enabled {
+        delete_local_branches_merged_into_deleted_parent_branches(&session, &original_branch)?;
+    }
     let outcome = execute_local_sync(
         &mut session,
         original_branch,
@@ -670,6 +673,73 @@ fn repair_closed_pull_requests_for_deleted_parent_branches(
     Ok(repaired_pull_requests)
 }
 
+fn delete_local_branches_merged_into_deleted_parent_branches(
+    session: &crate::core::store::StoreSession,
+    current_branch_name: &str,
+) -> io::Result<()> {
+    let graph = BranchGraph::new(&session.state);
+    let mut candidates = session
+        .state
+        .nodes
+        .iter()
+        .filter(|node| !node.archived)
+        .cloned()
+        .collect::<Vec<_>>();
+
+    candidates.sort_by(|left, right| {
+        graph
+            .branch_depth(right.id)
+            .cmp(&graph.branch_depth(left.id))
+            .then_with(|| left.branch_name.cmp(&right.branch_name))
+    });
+
+    for node in candidates {
+        if node.branch_name == current_branch_name || !git::branch_exists(&node.branch_name)? {
+            continue;
+        }
+        if !parent_branch_is_unavailable_for_sync_cleanup(&session.state, &node)? {
+            continue;
+        }
+
+        let Some(remote_target) = git::branch_push_target(&node.branch_name)? else {
+            continue;
+        };
+        if git::remote_tracking_branch_exists(
+            &remote_target.remote_name,
+            &remote_target.branch_name,
+        )? {
+            continue;
+        }
+        if merged_pull_request_restore_source(&node)?.is_none() {
+            continue;
+        }
+
+        let delete_status = git::delete_branch_force(&node.branch_name)?;
+        if !delete_status.success() {
+            return Err(io::Error::other(format!(
+                "failed to remove merged local branch '{}' before sync cleanup",
+                node.branch_name
+            )));
+        }
+    }
+
+    Ok(())
+}
+
+fn parent_branch_is_unavailable_for_sync_cleanup(
+    state: &DigState,
+    node: &BranchNode,
+) -> io::Result<bool> {
+    let ParentRef::Branch { node_id } = node.parent else {
+        return Ok(false);
+    };
+    let Some(parent_node) = state.find_any_branch_by_id(node_id) else {
+        return Ok(false);
+    };
+
+    Ok(parent_node.archived || !git::branch_exists(&parent_node.branch_name)?)
+}
+
 fn plan_parent_pull_request_repair(
     session: &crate::core::store::StoreSession,
     node: &BranchNode,

tests/sync.rs

@@ -1106,6 +1106,104 @@ exit 1
     });
 }
 
+#[test]
+fn sync_removes_local_parent_branch_after_repair_when_parent_was_merged_upstream() {
+    with_temp_repo("dig-sync-cli", |repo| {
+        initialize_main_repo(repo);
+        initialize_origin_remote(repo);
+        dig_ok(repo, &["init"]);
+        dig_ok(repo, &["branch", "feat/root"]);
+        commit_file(repo, "root.txt", "root\n", "feat: root");
+        git_ok(repo, &["push", "-u", "origin", "feat/root"]);
+        track_pull_request_number(repo, "feat/root", 101);
+        dig_ok(repo, &["branch", "feat/auth"]);
+        commit_file(repo, "auth.txt", "auth\n", "feat: auth");
+        git_ok(repo, &["push", "-u", "origin", "feat/auth"]);
+        track_pull_request_number(repo, "feat/auth", 102);
+        dig_ok(repo, &["branch", "feat/auth-ui"]);
+        commit_file(repo, "ui.txt", "ui\n", "feat: ui");
+        git_ok(repo, &["push", "-u", "origin", "feat/auth-ui"]);
+        track_pull_request_number(repo, "feat/auth-ui", 103);
+
+        let parent_head_oid = git_stdout(repo, &["rev-parse", "feat/auth"]);
+        let remote_repo = clone_origin(repo, "origin-worktree-local-parent");
+        git_ok(&remote_repo, &["checkout", "main"]);
+        git_ok(&remote_repo, &["merge", "--squash", "origin/feat/root"]);
+        git_ok(
+            &remote_repo,
+            &["commit", "--quiet", "-m", "feat: merge root"],
+        );
+        git_ok(&remote_repo, &["push", "origin", "main"]);
+        git_ok(&remote_repo, &["push", "origin", "--delete", "feat/root"]);
+        git_ok(&remote_repo, &["push", "origin", "--delete", "feat/auth"]);
+
+        git_ok(repo, &["checkout", "main"]);
+        git_ok(repo, &["branch", "-D", "feat/root"]);
+        set_branch_archived(repo, "feat/root", true);
+
+        let remote_update_log = install_remote_update_logger(repo);
+        let (path, gh_log_path) = install_fake_gh(
+            repo,
+            &format!(
+                r#"#!/bin/sh
+set -eu
+printf '%s\n' "$*" >> "$DIG_TEST_GH_LOG"
+if [ "$1" = "pr" ] && [ "$2" = "view" ] && [ "$3" = "102" ]; then
+  printf '{{"number":102,"state":"MERGED","mergedAt":"2026-03-26T12:00:00Z","baseRefName":"feat/root","headRefName":"feat/auth","headRefOid":"{parent_head_oid}","isDraft":false,"url":"https://github.com/acme/dig/pull/102"}}\n'
+  exit 0
+fi
+if [ "$1" = "pr" ] && [ "$2" = "view" ] && [ "$3" = "103" ]; then
+  printf '{{"number":103,"state":"CLOSED","mergedAt":null,"baseRefName":"feat/auth","headRefName":"feat/auth-ui","isDraft":false,"url":"https://github.com/acme/dig/pull/103"}}\n'
+  exit 0
+fi
+if [ "$1" = "pr" ] && [ "$2" = "reopen" ] && [ "$3" = "103" ]; then
+  exit 0
+fi
+if [ "$1" = "pr" ] && [ "$2" = "ready" ] && [ "$3" = "103" ] && [ "$4" = "--undo" ]; then
+  exit 0
+fi
+if [ "$1" = "pr" ] && [ "$2" = "edit" ] && [ "$3" = "103" ] && [ "$4" = "--base" ] && [ "$5" = "main" ]; then
+  exit 0
+fi
+echo "unexpected gh args: $*" >&2
+exit 1
+"#
+            ),
+        );
+
+        let output = dig_with_input_and_env(
+            repo,
+            &["sync"],
+            "n\n",
+            &[
+                ("PATH", path.as_str()),
+                ("DIG_TEST_GH_LOG", gh_log_path.as_str()),
+            ],
+        );
+        let stdout = strip_ansi(&String::from_utf8(output.stdout).unwrap());
+        let stderr = String::from_utf8(output.stderr).unwrap();
+
+        assert!(
+            output.status.success(),
+            "stdout:\n{stdout}\nstderr:\n{stderr}"
+        );
+        assert!(stdout.contains("Recovered pull requests:"));
+        assert!(stdout.contains("Deleted locally and no longer tracked by dig:"));
+        assert!(stdout.contains("- feat/auth"));
+        assert_eq!(git_stdout(repo, &["branch", "--list", "feat/auth"]), "");
+
+        let state = load_state_json(repo);
+        let child = find_node(&state, "feat/auth-ui").unwrap();
+        assert_eq!(child["base_ref"], "main");
+        assert_eq!(child["parent"]["kind"], "trunk");
+        assert!(find_archived_node(&state, "feat/auth").is_some());
+        assert_eq!(
+            count_remote_ref_updates(&remote_update_log, "refs/heads/feat/auth"),
+            2
+        );
+    });
+}
+
 #[test]
 fn sync_aborts_before_local_cleanup_when_pull_request_repair_fails() {
     with_temp_repo("dig-sync-cli", |repo| {