resolve-conflicts

Manually invoke the ci-conflict-resolver subagent for PR #$ARGUMENTS. This is the AISDLC-460 manual escape hatch — the watcher will pick it up on the next tick anyway, but the operator sometimes wants to drive the rebase + re-arm immediately (e.g. an auto-merge-armed PR is stuck and you want it cleared before walking away).

Why this lives in a slash command (not the agent directly)

Plugin subagents cannot use the Agent tool (the harness filters it out one level deep — empirical proof in AISDLC-69.2 / AISDLC-98). The slash command body runs in the main Claude Code session which DOES have Agent, so it can spawn ci-conflict-resolver directly. This is the same architecture pattern as /ai-sdlc rebase and /ai-sdlc execute.

Hard rules (NEVER violate)

1. Never merge a PR. Do not run gh pr merge for merge — gh pr merge --auto is the re-arm path the agent owns and is explicitly permitted (it does NOT merge; it only re-attaches the auto-merge request that the force-push cleared per AISDLC-356).
2. Never force-push with plain --force / -f. Always use --force-with-lease. The agent enforces this; this command does not push directly.
3. Never push to main or master. The agent refuses; this command also refuses at Step 1.
4. Never close PRs or issues.
5. Never delete branches.
6. Never edit .ai-sdlc/** or .github/workflows/**.
7. Never write GitHub Actions CI-skip magic tokens. (AISDLC-88.)

Step 0 — Validate input

PR=$ARGUMENTS
if [ -z "$PR" ] || ! echo "$PR" | grep -qE '^[0-9]+$'; then
  echo "ERROR: pass a PR number, e.g. /ai-sdlc resolve-conflicts 1234"
  exit 1
fi

Step 1 — Locate PR + worktree

gh pr view "$PR" --json number,title,headRefName,headRefOid,body,state,mergeStateStatus,statusCheckRollup \
  > /tmp/resolve-conflicts-pr-${PR}.json

BRANCH=$(jq -r '.headRefName' /tmp/resolve-conflicts-pr-${PR}.json)
HEAD_SHA=$(jq -r '.headRefOid' /tmp/resolve-conflicts-pr-${PR}.json)
TITLE=$(jq -r '.title' /tmp/resolve-conflicts-pr-${PR}.json)

# Refuse on main/master (Hard Rule 3).
if [ "$BRANCH" = "main" ] || [ "$BRANCH" = "master" ]; then
  echo "ERROR: refusing to operate on protected branch $BRANCH"
  exit 1
fi

TASK_ID_LOWER=$(echo "$BRANCH" | sed -E 's|^ai-sdlc/([a-z]+-[0-9.]+).*|\1|')
WORKTREE_PATH=".worktrees/$TASK_ID_LOWER"

if [ ! -d "$WORKTREE_PATH" ]; then
  git fetch origin "$BRANCH"
  mkdir -p .worktrees
  git worktree add "$WORKTREE_PATH" "origin/$BRANCH"
fi