make local branch error give commands to push / delete / rename branch - and to delete local worktree #120

Activity

1. JacobStephens2

   changed the title [-]make local branch error give commands to push / delete / rename branch[/-] [+]make local branch error give commands to push / delete / rename branch - and to delete local worktree[/+] on Sep 29, 2026
2. JacobStephens2 commented on Oct 17, 2026

   

   JacobStephens2

   on Oct 17, 2026

   OwnerAuthor

   More actions

   This was generated by AI during triage.

   Agent Brief

   Category: enhancement
   Summary: Make local Issue branch and Worktree acquisition failures print usable recovery commands.

   Current behavior:
   A local-only or divergent Issue branch produces prose such as “push, rename or delete it first.” A branch already checked out in another Worktree can surface only Git's raw refusal. The issue's examples therefore leave the user to reconstruct the relevant Git commands.

   Desired behavior:
   For these local-state acquisition failures, explain the relevant branch and checkout, then print concrete, correctly quoted recovery alternatives. Cover pushing preserved work, renaming the local branch, non-forcing local branch deletion, and non-forcing removal of the relevant Worktree. Identify a checkout that must be left or inspected before a branch can be renamed/deleted. Make the command's working-directory requirement clear. Where the current checkout offers the normal Continuation path, explain that route rather than implying the preserved work must be discarded.

   Printed advice must respect the existing preservation contract: thirdshift performs no recovery mutation automatically, and the examples use Git's ordinary refusal checks rather than force flags. Explain that removal may refuse while work remains and that the user must inspect/preserve it first.

   Key interfaces:

   • Worktree acquisition diagnostics: carry the selected Issue branch, launch repository and known occupied checkout into the error advice.
   • Existing Failed run preservation and Continuation behavior: remain authoritative.

   Acceptance criteria:

   • Local-only and divergent-branch errors name the branch and provide applicable push/rename/non-forcing-delete commands, without suggesting deletion is required.
   • An occupied Worktree error identifies the actual checkout and gives applicable non-forcing removal or Continuation guidance.
   • Commands remain valid for paths containing spaces or shell metacharacters, and identify the directory from which to run them.
   • Focused acquisition/CLI regression cases verify these failures still preserve local work and do not execute the printed commands.
   • Existing exit/failure and Worktree ownership behavior is preserved.

   Out of scope:
   Automatic deletion, force removal/reset, remote branch deletion, changing acquisition authority, global advice for every error (#53), and the separate missing Base branch advice in #295.
3. JacobStephens2

   added

   enhancementNew feature or requestNew feature or request

   ready-for-agentFully specified, ready for an AFK agentFully specified, ready for an AFK agent

   in-progressA Claim: thirdshift has taken this issueA Claim: thirdshift has taken this issue

   and removed

   ready-for-agentFully specified, ready for an AFK agentFully specified, ready for an AFK agent

   on Oct 17, 2026
4. JacobStephens2

   added 3 commits that reference this issue on Oct 17, 2026

   Print safe recovery commands for local acquisition failures (#120)

   2432d28

   Only suggest switching checkouts when it frees acquisition (#120)

   18091c2

   Explain acquisition path collisions in launch and main checkouts (#120)

   34a57f8
5. JacobStephens2

   closed this as completedin #749on Oct 17, 2026
6. JacobStephens2

   removed

   in-progressA Claim: thirdshift has taken this issueA Claim: thirdshift has taken this issue

   on Oct 17, 2026