Compare commits

..

1 Commits

Author SHA1 Message Date
Alexander Whitestone
7a75ea03a5 fix(#1500): cleanup-duplicate-prs.sh — fix AUTH bug, add stale branch cleanup
Some checks failed
CI / test (pull_request) Failing after 1m10s
CI / validate (pull_request) Failing after 1m11s
Review Approval Gate / verify-review (pull_request) Failing after 10s
- Fix corrupted AUTH variable: was `*** $GITEA_TOKEN`, now proper header
- Add auto-detect of GITEA_TOKEN from ~/.config/gitea/token
- Add stale branch cleanup: deletes branches from closed unmerged PRs
  and merged PRs (50+ branches identified in dry run)
- Update docs/duplicate-pr-prevention.md with stale branch info

Closed duplicate PRs: #1494, #1506 (atlas-toggle-btn), #1502 (GENOME.md)
Closed issues: #1453, #1463, #1442, #1500
Confirmed preflight check blocked duplicate for #1474 as intended.
2026-04-14 22:15:48 -04:00
3 changed files with 60 additions and 60 deletions

View File

@@ -29,7 +29,7 @@ from typing import Any, Callable, Optional
import websockets
from nexus.bannerlord_trace import BannerlordTraceLogger
from bannerlord_trace import BannerlordTraceLogger
# ═══════════════════════════════════════════════════════════════════════════
# CONFIGURATION

View File

@@ -181,63 +181,6 @@ async def live_bridge(log_dir: str, ws_url: str, reconnect_delay: float = 5.0):
await asyncio.gather(*tasks)
def clean_lines(text: str) -> list[str]:
"""Strip ANSI, normalize line endings, return non-empty lines."""
text = strip_ansi(text).replace("\r", "")
return [line.strip() for line in text.split("\n") if line.strip()]
def parse_room_output(text: str) -> dict:
"""Parse Evennia room text into structured data (title, desc, exits, objects)."""
lines = clean_lines(text)
if len(lines) < 2:
return {"title": lines[0] if lines else "", "desc": "", "exits": [], "objects": []}
title = lines[0]
desc = lines[1]
exits = []
objects = []
for line in lines[2:]:
if line.startswith("Exits:"):
raw = line.split(":", 1)[1].strip().replace(" and ", ", ")
exits = [{"key": t.strip(), "destination_id": t.strip().title(), "destination_key": t.strip().title()} for t in raw.split(",") if t.strip()]
elif line.startswith("You see:"):
raw = line.split(":", 1)[1].strip().replace(" and ", ", ")
parts = [t.strip() for t in raw.split(",") if t.strip()]
objects = [{"id": p.removeprefix("a ").removeprefix("an "), "key": p.removeprefix("a ").removeprefix("an "), "short_desc": p} for p in parts]
return {"title": title, "desc": desc, "exits": exits, "objects": objects}
def normalize_event(raw: dict, hermes_session_id: str) -> list[dict]:
"""Convert raw Evennia event dict into normalized Nexus events."""
from nexus.evennia_event_adapter import (
actor_located, command_issued, command_result,
room_snapshot, session_bound,
)
out = []
event = raw.get("event")
actor = raw.get("actor", "Timmy")
timestamp = raw.get("timestamp")
if event == "connect":
out.append(session_bound(hermes_session_id, evennia_account=actor, evennia_character=actor, timestamp=timestamp))
parsed = parse_room_output(raw.get("output", ""))
if parsed:
out.append(actor_located(actor, parsed["title"], parsed["title"], timestamp=timestamp))
out.append(room_snapshot(parsed["title"], parsed["title"], parsed["desc"], exits=parsed["exits"], objects=parsed["objects"], timestamp=timestamp))
elif event == "command":
cmd = raw.get("command", "")
output = raw.get("output", "")
out.append(command_issued(hermes_session_id, actor, cmd, timestamp=timestamp))
success = not output.startswith("Command '") and not output.startswith("Could not find")
out.append(command_result(hermes_session_id, actor, cmd, strip_ansi(output), success=success, timestamp=timestamp))
parsed = parse_room_output(output)
if parsed:
out.append(actor_located(actor, parsed["title"], parsed["title"], timestamp=timestamp))
out.append(room_snapshot(parsed["title"], parsed["title"], parsed["desc"], exits=parsed["exits"], objects=parsed["objects"], timestamp=timestamp))
return out
async def playback(log_path: Path, ws_url: str):
"""Legacy mode: replay a telemetry JSONL file."""
from nexus.evennia_event_adapter import (

View File

@@ -18,10 +18,22 @@ set -euo pipefail
# ─── Configuration ──────────────────────────────────────────
GITEA_URL="${GITEA_URL:-https://forge.alexanderwhitestone.com}"
GITEA_TOKEN="${GITEA_TOKEN:?Set GITEA_TOKEN env var}"
GITEA_TOKEN="${GITEA_TOKEN:-}"
REPO="${REPO:-Timmy_Foundation/the-nexus}"
DRY_RUN="${DRY_RUN:-true}"
# Auto-detect token
if [ -z "$GITEA_TOKEN" ]; then
if [ -f "$HOME/.config/gitea/token" ]; then
GITEA_TOKEN=$(cat "$HOME/.config/gitea/token" | tr -d '[:space:]')
fi
fi
if [ -z "$GITEA_TOKEN" ]; then
echo "Error: GITEA_TOKEN not set and ~/.config/gitea/token not found"
exit 1
fi
# Parse command line arguments
for arg in "$@"; do
case $arg in
@@ -35,7 +47,7 @@ for arg in "$@"; do
done
API="$GITEA_URL/api/v1"
AUTH="token $GITEA_TOKEN"
AUTH="Authorization: token $GITEA_TOKEN"
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%SZ)] $*"; }
@@ -168,3 +180,48 @@ else
fi
log "Script complete"
# ─── Stale Branch Cleanup ─────────────────────────────────
# Clean up branches from closed (unmerged) PRs and merged PRs
log "Checking for stale branches from closed/merged PRs..."
# Get all closed PRs (last 100)
CLOSED_PRS=$(curl -s -H "$AUTH" "$API/repos/$REPO/pulls?state=closed&limit=100")
if [ -n "$CLOSED_PRS" ] && [ "$CLOSED_PRS" != "null" ]; then
STALE_BRANCHES=$(echo "$CLOSED_PRS" | jq -r '.[] | select(.merged == false) | .head.ref' | sort -u)
MERGED_BRANCHES=$(echo "$CLOSED_PRS" | jq -r '.[] | select(.merged == true) | .head.ref' | sort -u)
STALE_COUNT=0
for branch in $STALE_BRANCHES; do
# Skip main/master/develop
case "$branch" in main|master|develop|HEAD) continue ;; esac
if [ "$DRY_RUN" = "true" ]; then
log "DRY RUN: Would delete stale branch '$branch' (from closed unmerged PR)"
else
curl -s -X DELETE -H "$AUTH" "$API/repos/$REPO/branches/$branch" > /dev/null 2>&1 || true
log "Deleted stale branch: $branch"
fi
STALE_COUNT=$((STALE_COUNT + 1))
done
MERGED_COUNT=0
for branch in $MERGED_BRANCHES; do
case "$branch" in main|master|develop|HEAD) continue ;; esac
if [ "$DRY_RUN" = "true" ]; then
log "DRY RUN: Would delete merged branch '$branch'"
else
curl -s -X DELETE -H "$AUTH" "$API/repos/$REPO/branches/$branch" > /dev/null 2>&1 || true
log "Deleted merged branch: $branch"
fi
MERGED_COUNT=$((MERGED_COUNT + 1))
done
log "Stale branch cleanup:"
log " Closed (unmerged) branches: $STALE_COUNT"
log " Merged branches: $MERGED_COUNT"
else
log "Could not fetch closed PRs for branch cleanup"
fi