From 0bedc43c94e1b73418e3d0465bde7c148393b0cf Mon Sep 17 00:00:00 2001 From: m3taversal Date: Tue, 24 Mar 2026 14:25:51 +0000 Subject: [PATCH] fix: silent checkout failure + Gate 2 staleness check (Ganymede review) Bug 1: 2>/dev/null on critical git commands swallowed checkout failures. Branches created from stale base (670 commits behind), carrying 56+ noise files. Fix: log all git output, fail hard on errors, add SHA canary to verify worktree matches origin/main. Bug 2: Gate 2 had no staleness check. Stale conflict branches blocked re-extraction forever (0 extractions for 5 days). Fix: 2-hour threshold. If branch >2h old and PR unmergeable, auto-close PR with audit comment, delete branch, and re-extract. Also handles orphan branches (no PR). Pentagon-Agent: Epimetheus <3D35839A-7722-4740-B93D-51157F7D5E70> --- batch-extract-50.sh | 76 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/batch-extract-50.sh b/batch-extract-50.sh index 4310414..5592a42 100755 --- a/batch-extract-50.sh +++ b/batch-extract-50.sh @@ -38,9 +38,19 @@ trap 'rm -f "$LOCKFILE"' EXIT echo "[$(date)] Starting batch extraction of $MAX sources" >> $LOG cd $REPO || exit 1 -git fetch origin main 2>/dev/null -git checkout -f main 2>/dev/null -git reset --hard origin/main 2>/dev/null + +# Bug fix: don't swallow errors on critical git commands (Ganymede review) +git fetch origin main >> $LOG 2>&1 || { echo "[$(date)] FATAL: fetch origin main failed" >> $LOG; exit 1; } +git checkout -f main >> $LOG 2>&1 || { echo "[$(date)] FATAL: checkout main failed" >> $LOG; exit 1; } +git reset --hard origin/main >> $LOG 2>&1 || { echo "[$(date)] FATAL: reset --hard failed" >> $LOG; exit 1; } + +# SHA canary: verify extract worktree matches origin/main (Ganymede review) +LOCAL_SHA=$(git rev-parse HEAD) +REMOTE_SHA=$(git rev-parse origin/main) +if [ "$LOCAL_SHA" != "$REMOTE_SHA" ]; then + echo "[$(date)] FATAL: extract worktree diverged from main ($LOCAL_SHA vs $REMOTE_SHA)" >> $LOG + exit 1 +fi # Pre-extraction cleanup: remove queue files that already exist in archive # This runs on the MAIN worktree (not extract/) so deletions are committed to git. @@ -97,18 +107,58 @@ for SOURCE in $SOURCES; do fi # Gate 2: Branch exists on Forgejo? Extraction already in progress (cached lookup) + # Enhancement: 2-hour staleness check (Ganymede review) — if branch is >2h old + # and PR is unmergeable, close PR + delete branch and re-extract if echo "$REMOTE_BRANCHES" | grep -q "refs/heads/$BRANCH$"; then - echo "[$(date)] [$COUNT/$MAX] SKIP $BASENAME (branch exists — in progress)" >> $LOG - SKIPPED=$((SKIPPED + 1)) - continue + # Check branch age + BRANCH_SHA=$(echo "$REMOTE_BRANCHES" | grep "refs/heads/$BRANCH$" | awk '{print $1}') + BRANCH_AGE_EPOCH=$(git log -1 --format='%ct' "$BRANCH_SHA" 2>/dev/null || echo 0) + NOW_EPOCH=$(date +%s) + AGE_HOURS=$(( (NOW_EPOCH - BRANCH_AGE_EPOCH) / 3600 )) + + if [ "$AGE_HOURS" -ge 2 ]; then + # Branch is stale — check if PR is mergeable + PR_NUM=$(curl -sf "$FORGEJO_URL/api/v1/repos/teleo/teleo-codex/pulls?state=open&head=teleo:$BRANCH&limit=1" \ + -H "Authorization: token $TOKEN" | python3 -c 'import sys,json; prs=json.load(sys.stdin); print(prs[0]["number"] if prs else "")' 2>/dev/null) + if [ -n "$PR_NUM" ]; then + PR_MERGEABLE=$(curl -sf "$FORGEJO_URL/api/v1/repos/teleo/teleo-codex/pulls/$PR_NUM" \ + -H "Authorization: token $TOKEN" | python3 -c 'import sys,json; print(json.load(sys.stdin).get("mergeable","true"))' 2>/dev/null) + if [ "$PR_MERGEABLE" = "False" ] || [ "$PR_MERGEABLE" = "false" ]; then + echo "[$(date)] [$COUNT/$MAX] STALE: $BASENAME (${AGE_HOURS}h old, unmergeable PR #$PR_NUM) — closing + re-extracting" >> $LOG + # Close PR with audit comment + curl -sf -X POST "$FORGEJO_URL/api/v1/repos/teleo/teleo-codex/issues/$PR_NUM/comments" \ + -H "Authorization: token $TOKEN" -H "Content-Type: application/json" \ + -d '{"body":"Auto-closed: extraction branch stale >2h, conflict unresolvable. Source will be re-extracted from current main."}' > /dev/null 2>&1 + curl -sf -X PATCH "$FORGEJO_URL/api/v1/repos/teleo/teleo-codex/pulls/$PR_NUM" \ + -H "Authorization: token $TOKEN" -H "Content-Type: application/json" \ + -d '{"state":"closed"}' > /dev/null 2>&1 + # Delete remote branch + git push origin --delete "$BRANCH" 2>/dev/null + # Fall through to extraction below + else + echo "[$(date)] [$COUNT/$MAX] SKIP $BASENAME (branch exists ${AGE_HOURS}h, PR #$PR_NUM mergeable — waiting)" >> $LOG + SKIPPED=$((SKIPPED + 1)) + continue + fi + else + # No PR found but branch exists — orphan branch, clean up + echo "[$(date)] [$COUNT/$MAX] STALE: $BASENAME (orphan branch ${AGE_HOURS}h, no PR) — deleting" >> $LOG + git push origin --delete "$BRANCH" 2>/dev/null + # Fall through to extraction + fi + else + echo "[$(date)] [$COUNT/$MAX] SKIP $BASENAME (branch exists — in progress, ${AGE_HOURS}h old)" >> $LOG + SKIPPED=$((SKIPPED + 1)) + continue + fi fi echo "[$(date)] [$COUNT/$MAX] Processing $BASENAME" >> $LOG - # Reset to main - git checkout -f main 2>/dev/null - git fetch origin main 2>/dev/null - git reset --hard origin/main 2>/dev/null + # Reset to main (log errors — don't swallow) + git checkout -f main >> $LOG 2>&1 || { echo " -> SKIP (checkout main failed)" >> $LOG; SKIPPED=$((SKIPPED + 1)); continue; } + git fetch origin main >> $LOG 2>&1 + git reset --hard origin/main >> $LOG 2>&1 || { echo " -> SKIP (reset failed)" >> $LOG; SKIPPED=$((SKIPPED + 1)); continue; } # Clean stale remote branch (Leo's catch — prevents checkout conflicts) git push origin --delete "$BRANCH" 2>/dev/null @@ -163,7 +213,7 @@ Pentagon-Agent: Epimetheus <3D35839A-7722-4740-B93D-51157F7D5E70>" >> $LOG 2>&1 echo " -> SUCCESS ($CHANGED files)" >> $LOG # Back to main - git checkout -f main 2>/dev/null + git checkout -f main >> $LOG 2>&1 # Rate limit sleep 2 @@ -171,5 +221,5 @@ done echo "[$(date)] Batch complete: $SUCCESS success, $FAILED failed, $SKIPPED skipped (already attempted)" >> $LOG -git checkout -f main 2>/dev/null -git reset --hard origin/main 2>/dev/null +git checkout -f main >> $LOG 2>&1 +git reset --hard origin/main >> $LOG 2>&1