Rebase onto Main

Rebase the current branch onto the latest main branch, resolving conflicts by preferring upstream changes.

Setup

Determine the repository for all gh commands:

REPO=$(./scripts/agents/tooling/agentTool.ts getRepo)

Always pass -R "$REPO" to gh commands.

Workflow

1. Fetch latest changes: