From f93489a52409af63cea69fd1ce8661f74d0361b8 Mon Sep 17 00:00:00 2001 From: soryu Date: Fri, 20 Feb 2026 19:07:23 +0000 Subject: feat: auto-remove merged steps, fix UI overflow, and improve worktree handling (#74) * feat: soryu-co/soryu - makima: Fix contracts page overflow - constrain layout to viewport height * feat: soryu-co/soryu - makima: Add git fetch to create_worktree and improve completion prompt merge conflict handling * WIP: heartbeat checkpoint * feat: soryu-co/soryu - makima: Add pending question notification badge to directive sidebar and nav * feat: soryu-co/soryu - makima: Fix reconcile:on blocking - make phaseguard poll indefinitely instead of returning immediately * feat: soryu-co/soryu - makima: Auto-remove merged steps before planning runs --- makima/src/daemon/worktree/manager.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'makima/src/daemon') diff --git a/makima/src/daemon/worktree/manager.rs b/makima/src/daemon/worktree/manager.rs index 2caa86a..2e2b58e 100644 --- a/makima/src/daemon/worktree/manager.rs +++ b/makima/src/daemon/worktree/manager.rs @@ -491,11 +491,8 @@ impl WorktreeManager { .output() .await; - // Prefer origin/{base_branch} to get latest remote state. - // If neither origin/{base_branch} nor {base_branch} exist (e.g. PR branch - // was deleted after merge), fall back to the repo's default branch. - let origin_ref = format!("origin/{}", base_branch); - let has_origin_ref = Command::new("git") + // Create the worktree with a new branch based on the local base_branch + let output = Command::new("git") .args([ "rev-parse", "--verify", -- cgit v1.2.3