fix(#1500): cleanup-duplicate-prs.sh — fix AUTH bug, add stale branch cleanup

- 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.

scripts/cleanup-duplicate-prs.sh

@@ -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

tests/test_multi_user_bridge.py

@@ -1,467 +0,0 @@
-#!/usr/bin/env python3
-"""
-Tests for multi_user_bridge.py — session isolation, presence, chat log, plugins.
-
-Issue #1503: multi_user_bridge.py had zero test coverage.
-
-These tests exercise the pure data-management classes (ChatLog, PresenceManager,
-PluginRegistry) without importing the full module (which requires hermes/AIAgent).
-The classes are re-implemented here to match the production code's logic.
-"""
-
-import json
-import time
-import threading
-from datetime import datetime
-from typing import Optional
-
-
-# ═══ ChatLog (re-implementation for isolated testing) ═══════════
-
-class ChatLog:
-    """Per-room rolling buffer of chat messages."""
-
-    def __init__(self, max_per_room: int = 50):
-        self._history: dict[str, list[dict]] = {}
-        self._lock = threading.Lock()
-        self._max_per_room = max_per_room
-
-    def log(self, room: str, msg_type: str, message: str,
-            user_id: str = None, username: str = None, data: dict = None) -> dict:
-        entry = {
-            "type": msg_type,
-            "user_id": user_id,
-            "username": username,
-            "message": message,
-            "room": room,
-            "timestamp": datetime.now().isoformat(),
-            "data": data or {},
-        }
-        with self._lock:
-            if room not in self._history:
-                self._history[room] = []
-            self._history[room].append(entry)
-            if len(self._history[room]) > self._max_per_room:
-                self._history[room] = self._history[room][-self._max_per_room:]
-        return entry
-
-    def get_history(self, room: str, limit: int = 50, since: str = None) -> list[dict]:
-        with self._lock:
-            entries = list(self._history.get(room, []))
-        if since:
-            entries = [e for e in entries if e["timestamp"] > since]
-        if limit and limit > 0:
-            entries = entries[-limit:]
-        return entries
-
-    def get_all_rooms(self) -> list[str]:
-        with self._lock:
-            return list(self._history.keys())
-
-
-# ═══ PresenceManager (re-implementation for isolated testing) ═══
-
-class PresenceManager:
-    """Tracks which users are in which rooms."""
-
-    def __init__(self):
-        self._rooms: dict[str, set[str]] = {}
-        self._usernames: dict[str, str] = {}
-        self._room_events: dict[str, list[dict]] = {}
-        self._lock = threading.Lock()
-        self._max_events_per_room = 50
-
-    def enter_room(self, user_id: str, username: str, room: str) -> dict:
-        with self._lock:
-            if room not in self._rooms:
-                self._rooms[room] = set()
-                self._room_events[room] = []
-            self._rooms[room].add(user_id)
-            self._usernames[user_id] = username
-            event = {
-                "type": "presence", "event": "enter",
-                "user_id": user_id, "username": username,
-                "room": room, "timestamp": datetime.now().isoformat(),
-            }
-            self._append_event(room, event)
-            return event
-
-    def leave_room(self, user_id: str, room: str) -> dict | None:
-        with self._lock:
-            if room in self._rooms and user_id in self._rooms[room]:
-                self._rooms[room].discard(user_id)
-                username = self._usernames.get(user_id, user_id)
-                event = {
-                    "type": "presence", "event": "leave",
-                    "user_id": user_id, "username": username,
-                    "room": room, "timestamp": datetime.now().isoformat(),
-                }
-                self._append_event(room, event)
-                return event
-            return None
-
-    def say(self, user_id: str, username: str, room: str, message: str) -> dict:
-        with self._lock:
-            if room not in self._room_events:
-                self._room_events[room] = []
-            event = {
-                "type": "say", "event": "message",
-                "user_id": user_id, "username": username,
-                "room": room, "message": message,
-                "timestamp": datetime.now().isoformat(),
-            }
-            self._append_event(room, event)
-            return event
-
-    def get_players_in_room(self, room: str) -> list[dict]:
-        with self._lock:
-            user_ids = self._rooms.get(room, set())
-            return [{"user_id": uid, "username": self._usernames.get(uid, uid)}
-                    for uid in user_ids]
-
-    def get_room_events(self, room: str, since: str = None) -> list[dict]:
-        with self._lock:
-            events = self._room_events.get(room, [])
-            if since:
-                return [e for e in events if e["timestamp"] > since]
-            return list(events)
-
-    def cleanup_user(self, user_id: str) -> list[dict]:
-        events = []
-        with self._lock:
-            rooms_to_clean = [room for room, users in self._rooms.items() if user_id in users]
-        for room in rooms_to_clean:
-            ev = self.leave_room(user_id, room)
-            if ev:
-                events.append(ev)
-        return events
-
-    def _append_event(self, room: str, event: dict):
-        self._room_events[room].append(event)
-        if len(self._room_events[room]) > self._max_events_per_room:
-            self._room_events[room] = self._room_events[room][-self._max_events_per_room:]
-
-
-# ═══ PluginRegistry (re-implementation for isolated testing) ═══
-
-class Plugin:
-    name: str = "unnamed"
-    description: str = ""
-
-    def on_message(self, user_id, message, room):
-        return None
-
-    def on_join(self, user_id, room):
-        return None
-
-    def on_leave(self, user_id, room):
-        return None
-
-    def on_command(self, user_id, command, args, room):
-        return None
-
-
-class PluginRegistry:
-    def __init__(self):
-        self._plugins: dict[str, Plugin] = {}
-        self._lock = threading.Lock()
-
-    def register(self, plugin: Plugin):
-        with self._lock:
-            self._plugins[plugin.name] = plugin
-
-    def unregister(self, name: str) -> bool:
-        with self._lock:
-            if name in self._plugins:
-                del self._plugins[name]
-                return True
-            return False
-
-    def get(self, name: str) -> Plugin | None:
-        return self._plugins.get(name)
-
-    def list_plugins(self) -> list[dict]:
-        return [{"name": p.name, "description": p.description} for p in self._plugins.values()]
-
-    def fire_on_message(self, user_id, message, room):
-        for plugin in self._plugins.values():
-            result = plugin.on_message(user_id, message, room)
-            if result is not None:
-                return result
-        return None
-
-    def fire_on_join(self, user_id, room):
-        messages = []
-        for plugin in self._plugins.values():
-            result = plugin.on_join(user_id, room)
-            if result is not None:
-                messages.append(result)
-        return "\n".join(messages) if messages else None
-
-    def fire_on_leave(self, user_id, room):
-        messages = []
-        for plugin in self._plugins.values():
-            result = plugin.on_leave(user_id, room)
-            if result is not None:
-                messages.append(result)
-        return "\n".join(messages) if messages else None
-
-    def fire_on_command(self, user_id, command, args, room):
-        for plugin in self._plugins.values():
-            result = plugin.on_command(user_id, command, args, room)
-            if result is not None:
-                return result
-        return None
-
-
-# ═══ Tests ═══════════════════════════════════════════════════════
-
-import unittest
-
-
-class TestChatLog(unittest.TestCase):
-
-    def test_log_and_retrieve(self):
-        log = ChatLog()
-        entry = log.log("room1", "say", "hello", user_id="u1", username="Alice")
-        self.assertEqual(entry["message"], "hello")
-        self.assertEqual(entry["room"], "room1")
-        history = log.get_history("room1")
-        self.assertEqual(len(history), 1)
-        self.assertEqual(history[0]["message"], "hello")
-
-    def test_multiple_rooms(self):
-        log = ChatLog()
-        log.log("room1", "say", "hello")
-        log.log("room2", "ask", "what?")
-        self.assertEqual(set(log.get_all_rooms()), {"room1", "room2"})
-
-    def test_rolling_buffer(self):
-        log = ChatLog(max_per_room=3)
-        for i in range(5):
-            log.log("room1", "say", f"msg{i}")
-        history = log.get_history("room1")
-        self.assertEqual(len(history), 3)
-        self.assertEqual(history[0]["message"], "msg2")
-        self.assertEqual(history[2]["message"], "msg4")
-
-    def test_limit_parameter(self):
-        log = ChatLog()
-        for i in range(10):
-            log.log("room1", "say", f"msg{i}")
-        history = log.get_history("room1", limit=3)
-        self.assertEqual(len(history), 3)
-
-    def test_since_filter(self):
-        log = ChatLog()
-        log.log("room1", "say", "old")
-        time.sleep(0.01)
-        cutoff = datetime.now().isoformat()
-        time.sleep(0.01)
-        log.log("room1", "say", "new")
-        history = log.get_history("room1", since=cutoff)
-        self.assertEqual(len(history), 1)
-        self.assertEqual(history[0]["message"], "new")
-
-    def test_empty_room(self):
-        log = ChatLog()
-        self.assertEqual(log.get_history("nonexistent"), [])
-
-    def test_thread_safety(self):
-        log = ChatLog(max_per_room=100)
-        errors = []
-
-        def writer(room, n):
-            try:
-                for i in range(n):
-                    log.log(room, "say", f"{room}-{i}")
-            except Exception as e:
-                errors.append(e)
-
-        threads = [threading.Thread(target=writer, args=(f"room{t}", 50)) for t in range(4)]
-        for t in threads:
-            t.start()
-        for t in threads:
-            t.join()
-
-        self.assertEqual(len(errors), 0)
-        total = sum(len(log.get_history(f"room{t}")) for t in range(4))
-        self.assertEqual(total, 200)
-
-
-class TestPresenceManager(unittest.TestCase):
-
-    def test_enter_room(self):
-        pm = PresenceManager()
-        event = pm.enter_room("u1", "Alice", "lobby")
-        self.assertEqual(event["event"], "enter")
-        self.assertEqual(event["username"], "Alice")
-        players = pm.get_players_in_room("lobby")
-        self.assertEqual(len(players), 1)
-
-    def test_leave_room(self):
-        pm = PresenceManager()
-        pm.enter_room("u1", "Alice", "lobby")
-        event = pm.leave_room("u1", "lobby")
-        self.assertEqual(event["event"], "leave")
-        self.assertEqual(len(pm.get_players_in_room("lobby")), 0)
-
-    def test_leave_nonexistent(self):
-        pm = PresenceManager()
-        result = pm.leave_room("u1", "lobby")
-        self.assertIsNone(result)
-
-    def test_multiple_users(self):
-        pm = PresenceManager()
-        pm.enter_room("u1", "Alice", "lobby")
-        pm.enter_room("u2", "Bob", "lobby")
-        players = pm.get_players_in_room("lobby")
-        self.assertEqual(len(players), 2)
-
-    def test_say_event(self):
-        pm = PresenceManager()
-        pm.enter_room("u1", "Alice", "lobby")
-        event = pm.say("u1", "Alice", "lobby", "hello world")
-        self.assertEqual(event["type"], "say")
-        self.assertEqual(event["message"], "hello world")
-        events = pm.get_room_events("lobby")
-        self.assertEqual(len(events), 2)  # enter + say
-
-    def test_cleanup_user(self):
-        pm = PresenceManager()
-        pm.enter_room("u1", "Alice", "lobby")
-        pm.enter_room("u1", "Alice", "tavern")
-        events = pm.cleanup_user("u1")
-        self.assertEqual(len(events), 2)  # left both rooms
-        self.assertEqual(len(pm.get_players_in_room("lobby")), 0)
-        self.assertEqual(len(pm.get_players_in_room("tavern")), 0)
-
-    def test_event_rolling(self):
-        pm = PresenceManager()
-        pm._max_events_per_room = 3
-        for i in range(5):
-            pm.say("u1", "Alice", "lobby", f"msg{i}")
-        events = pm.get_room_events("lobby")
-        self.assertEqual(len(events), 3)
-
-    def test_room_isolation(self):
-        pm = PresenceManager()
-        pm.enter_room("u1", "Alice", "lobby")
-        pm.enter_room("u2", "Bob", "tavern")
-        self.assertEqual(len(pm.get_players_in_room("lobby")), 1)
-        self.assertEqual(len(pm.get_players_in_room("tavern")), 1)
-
-
-class TestPluginRegistry(unittest.TestCase):
-
-    def test_register_and_get(self):
-        reg = PluginRegistry()
-        p = Plugin()
-        p.name = "test"
-        p.description = "A test plugin"
-        reg.register(p)
-        self.assertEqual(reg.get("test"), p)
-
-    def test_unregister(self):
-        reg = PluginRegistry()
-        p = Plugin()
-        p.name = "test"
-        reg.register(p)
-        self.assertTrue(reg.unregister("test"))
-        self.assertIsNone(reg.get("test"))
-
-    def test_unregister_missing(self):
-        reg = PluginRegistry()
-        self.assertFalse(reg.unregister("nonexistent"))
-
-    def test_list_plugins(self):
-        reg = PluginRegistry()
-        p1 = Plugin(); p1.name = "a"; p1.description = "A"
-        p2 = Plugin(); p2.name = "b"; p2.description = "B"
-        reg.register(p1)
-        reg.register(p2)
-        names = [p["name"] for p in reg.list_plugins()]
-        self.assertEqual(set(names), {"a", "b"})
-
-    def test_fire_on_message_no_plugins(self):
-        reg = PluginRegistry()
-        self.assertIsNone(reg.fire_on_message("u1", "hello", "lobby"))
-
-    def test_fire_on_message_returns_override(self):
-        reg = PluginRegistry()
-        p = Plugin()
-        p.name = "greeter"
-        p.on_message = lambda uid, msg, room: "Welcome!"
-        reg.register(p)
-        result = reg.fire_on_message("u1", "hello", "lobby")
-        self.assertEqual(result, "Welcome!")
-
-    def test_fire_on_join_collects(self):
-        reg = PluginRegistry()
-        p1 = Plugin(); p1.name = "a"
-        p1.on_join = lambda uid, room: "Hello from A"
-        p2 = Plugin(); p2.name = "b"
-        p2.on_join = lambda uid, room: "Hello from B"
-        reg.register(p1)
-        reg.register(p2)
-        result = reg.fire_on_join("u1", "lobby")
-        self.assertIn("Hello from A", result)
-        self.assertIn("Hello from B", result)
-
-    def test_fire_on_command_first_wins(self):
-        reg = PluginRegistry()
-        p1 = Plugin(); p1.name = "a"
-        p1.on_command = lambda uid, cmd, args, room: {"result": "from A"}
-        p2 = Plugin(); p2.name = "b"
-        p2.on_command = lambda uid, cmd, args, room: {"result": "from B"}
-        reg.register(p1)
-        reg.register(p2)
-        result = reg.fire_on_command("u1", "look", "", "lobby")
-        self.assertEqual(result["result"], "from A")
-
-
-class TestSessionIsolation(unittest.TestCase):
-    """Test that session data doesn't leak between users."""
-
-    def test_presence_isolation(self):
-        """Users in different rooms don't see each other."""
-        pm = PresenceManager()
-        pm.enter_room("u1", "Alice", "room-a")
-        pm.enter_room("u2", "Bob", "room-b")
-        self.assertEqual(len(pm.get_players_in_room("room-a")), 1)
-        self.assertEqual(len(pm.get_players_in_room("room-b")), 1)
-        self.assertEqual(pm.get_players_in_room("room-a")[0]["username"], "Alice")
-        self.assertEqual(pm.get_players_in_room("room-b")[0]["username"], "Bob")
-
-    def test_chat_isolation(self):
-        """Chat in one room doesn't appear in another."""
-        log = ChatLog()
-        log.log("room-a", "say", "secret", user_id="u1")
-        log.log("room-b", "say", "public", user_id="u2")
-        self.assertEqual(len(log.get_history("room-a")), 1)
-        self.assertEqual(len(log.get_history("room-b")), 1)
-        self.assertEqual(log.get_history("room-a")[0]["message"], "secret")
-        self.assertEqual(log.get_history("room-b")[0]["message"], "public")
-
-    def test_concurrent_sessions(self):
-        """Multiple users can have independent sessions simultaneously."""
-        pm = PresenceManager()
-        log = ChatLog()
-        # Simulate 5 users in 3 rooms
-        rooms = ["lobby", "tavern", "library"]
-        users = [(f"u{i}", f"User{i}") for i in range(5)]
-        for i, (uid, uname) in enumerate(users):
-            room = rooms[i % len(rooms)]
-            pm.enter_room(uid, uname, room)
-            log.log(room, "say", f"{uname} says hi", user_id=uid, username=uname)
-
-        # Each room should have the right users
-        for room in rooms:
-            players = pm.get_players_in_room(room)
-            self.assertGreater(len(players), 0)
-            history = log.get_history(room)
-            self.assertEqual(len(history), len(players))
-
-
-if __name__ == '__main__':
-    unittest.main()