Git Main

CURRENT_BRANCH=$(git branch --show-current)

Step 3: Execute (Mode-Dependent)

Trunk Mode (BRANCHING_MODE=trunk)

If on main:

git push origin main

If on a feature branch:

• Ask the user: "You're on branch $CURRENT_BRANCH. Create a PR to main, or merge directly?"
  • PR: gh pr create --base main --title "scope(NNN): title" --body "..."
  • Direct merge: git checkout main && git merge $CURRENT_BRANCH && git push origin main

Worktree Mode (BRANCHING_MODE=worktree)

Always on a feature branch in worktree mode:

gh pr create --base main \
  --title "scope(NNN): title" \
  --body "## Summary
Merges scope NNN work into main.

## Scopes
- NNN: title"

Step 4: Scope Transition

For each completed scope being pushed:

bash .claude/hooks/scope-transition.sh --from completed --to main --scope NNN

Step 5: Signal Completion (REQUIRED)

Always emit when finished — this is not optional. Emit success or failure so the dispatch resolves immediately:

# On success — with a scope:
bash .claude/hooks/orbital-emit.sh AGENT_COMPLETED '{"outcome":"success","action":"pr_main"}' --scope "{NNN}"

# On success — without a scope:
bash .claude/hooks/orbital-emit.sh AGENT_COMPLETED '{"outcome":"success","action":"pr_main"}'

# On failure (push rejected, PR failed, merge conflicts, etc.):
bash .claude/hooks/orbital-emit.sh AGENT_COMPLETED '{"outcome":"failure","action":"pr_main"}' --scope "{NNN}"

Batch Support

When BATCH_SCOPE_IDS and MERGE_MODE env vars are set:

MERGE_MODE=${MERGE_MODE:-push}  # push, pr, or direct

• push: git push origin main
• pr: gh pr create --base main
• direct: git checkout main && git merge ... && git push origin main

Transition all scopes in BATCH_SCOPE_IDS (comma-separated).