#!/usr/bin/env bash
set -e
cd /home/claude/repos/exult-agent
echo "=== abort cherry-pick ==="
git cherry-pick --abort
echo "=== fetch origin ==="
git fetch origin
echo "=== check curogram-auth.ts on origin/main ==="
git ls-tree --name-only origin/main tools/curogram-mcp/ || echo "no curogram-mcp dir on origin/main"
echo "=== fast-forward main to origin/main ==="
git merge --ff-only origin/main
echo "=== main HEAD now ==="
git log -1 --format="%H | %s"
echo "=== does auth.ts exist on main now? ==="
git ls-files tools/curogram-mcp/curogram-auth.ts