gh pr merge fails when running from a worktree

[avifenesh]

Problem

When /ship runs from a git worktree (created by /next-task Phase 3), the merge phase fails because gh pr merge --delete-branch tries to checkout main locally, which is already locked by the main worktree.

failed to run git: fatal: 'main' is already used by worktree at 'C:/Users/avife/agent-sh/web-ctl'

Steps to Reproduce

1. /next-task creates a worktree at ../worktrees/web-ctl-fix-XXX
2. Implementation and PR creation happen from the worktree
3. ship:ship runs gh pr merge N --squash --delete-branch from the worktree
4. gh tries to git checkout main after merge - fails because main is used by the main worktree
5. Workaround: run gh pr merge from the main repo directory instead

Expected

Phase 6 (merge) should detect it's running inside a worktree and handle this automatically - either by using gh pr merge --repo owner/repo without local checkout, or by switching to the main repo path before merging.

Frequency

This will happen every time /next-task is used, since it always creates worktrees.

[avifenesh]

[DONE] Task Completed Successfully

PR: #4
Status: Merged to main
Commit: 542c07f

Summary

• Added worktree detection to merge, cleanup, deployment, and error handling phases
• Uses gh pr merge --repo without --delete-branch in worktree context
• Gets merge SHA from PR metadata instead of local checkout
• Blocks multi-branch deployment/rollback from worktrees with clear guidance
• Reviewed across 2 iterations (code quality, security, performance, test coverage)

---

Processed by AgentSys /next-task workflow.