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.
2026-04-14 22:15:48 -04:00
4 changed files with 101 additions and 90 deletions
--- a/fleet/fleet-routing.json
+++ b/fleet/fleet-routing.json
@@ -1,13 +1,9 @@
 {
  "version": 1,
  "generated": "2026-04-06",
-  "refs": [
-    "#836",
-    "#204",
-    "#195",
-    "#196"
-  ],
+  "refs": ["#836", "#204", "#195", "#196"],
  "description": "Canonical fleet routing table. Evaluated agents, routing verdicts, and dispatch rules for the Timmy Foundation task harness.",
+
  "agents": [
    {
      "id": 27,
@@ -50,14 +46,12 @@
      "location": "Bag End, The Shire (VPS)",
      "description": "Ollama on VPS. Speaks when spoken to. Prefers quiet. Not for delegated work.",
      "primary_role": "on-request-queries",
-      "routing_verdict": "ROUTE TO: background monitoring, status checks, low-priority Q&A. Only on-request \u2014 do not delegate autonomously.",
+      "routing_verdict": "ROUTE TO: background monitoring, status checks, low-priority Q&A. Only on-request — do not delegate autonomously.",
      "active": true,
      "do_not_route": false,
      "created": "2026-04-02",
      "repo_count": 1,
-      "repos": [
-        "bilbobagginshire/bilbo-adventures"
-      ]
+      "repos": ["bilbobagginshire/bilbo-adventures"]
    },
    {
      "id": 24,
@@ -66,7 +60,7 @@
      "model": "codex",
      "tier": "prepaid",
      "location": "The Harness",
-      "description": "OpenClaw bridge. Protocol adapter layer \u2014 not a personality. Infrastructure, not a destination.",
+      "description": "OpenClaw bridge. Protocol adapter layer — not a personality. Infrastructure, not a destination.",
      "primary_role": "protocol-bridge",
      "routing_verdict": "DO NOT ROUTE directly. claw-code is the bridge to external Codex agents, not an endpoint. Remove from routing cascade.",
      "active": true,
@@ -85,7 +79,7 @@
      "location": "Below the Surface",
      "description": "Infrastructure, deployments, bedrock services. Needs model assignment before activation.",
      "primary_role": "devops",
-      "routing_verdict": "DO NOT ROUTE \u2014 no model assigned yet. Activate after Epic #196 (Local Model Fleet) assigns a model.",
+      "routing_verdict": "DO NOT ROUTE — no model assigned yet. Activate after Epic #196 (Local Model Fleet) assigns a model.",
      "active": false,
      "do_not_route": true,
      "do_not_route_reason": "No model assigned. Blocked on Epic #196.",
@@ -103,15 +97,13 @@
      "location": "The Archive",
      "description": "Original prototype. Museum piece. Preserved for historical reference only.",
      "primary_role": "inactive",
-      "routing_verdict": "DO NOT ROUTE \u2014 retired from active duty. Preserved only.",
+      "routing_verdict": "DO NOT ROUTE — retired from active duty. Preserved only.",
      "active": false,
      "do_not_route": true,
      "do_not_route_reason": "Retired prototype. Historical preservation only.",
      "created": "2026-03-31",
      "repo_count": 1,
-      "repos": [
-        "allegro-primus/first-steps"
-      ]
+      "repos": ["allegro-primus/first-steps"]
    },
    {
      "id": 5,
@@ -128,10 +120,7 @@
      "gap": "Agent description is empty in Gitea profile. Needs enrichment.",
      "created": "2026-03-14",
      "repo_count": 2,
-      "repos": [
-        "kimi/the-nexus-fork",
-        "kimi/Timmy-time-dashboard"
-      ]
+      "repos": ["kimi/the-nexus-fork", "kimi/Timmy-time-dashboard"]
    },
    {
      "id": 20,
@@ -159,10 +148,10 @@
      "id": 19,
      "name": "ezra",
      "gitea_user": "ezra",
-      "model": "kimi-coding/kimi-k2.5",
+      "model": "claude",
      "tier": "prepaid",
      "location": "Hermes VPS",
-      "description": "Archivist. Research and triage wizard. 9 repos owned \u2014 most in the fleet. Handles complex multi-file and cross-repo work.",
+      "description": "Archivist. Claude-Hermes wizard. 9 repos owned — most in the fleet. Handles complex multi-file and cross-repo work.",
      "primary_role": "documentation",
      "routing_verdict": "ROUTE TO: docs, specs, architecture, complex multi-file work. Escalate here when breadth and precision both matter.",
      "active": true,
@@ -187,7 +176,7 @@
      "gitea_user": "bezalel",
      "model": "groq",
      "tier": "free",
-      "location": "TestBed VPS \u2014 The Forge",
+      "location": "TestBed VPS — The Forge",
      "description": "Builder, debugger, testbed wizard. Groq-powered, free tier. Strong on PR review and CI.",
      "primary_role": "code-review",
      "routing_verdict": "ROUTE TO: PR review, test writing, debugging, CI fixes.",
@@ -195,39 +184,29 @@
      "do_not_route": false,
      "created": "2026-03-29",
      "repo_count": 1,
-      "repos": [
-        "bezalel/forge-log"
-      ]
+      "repos": ["bezalel/forge-log"]
    }
  ],
+
  "routing_cascade": {
-    "description": "Cost-optimized routing cascade \u2014 cheapest capable agent first, escalate on complexity.",
+    "description": "Cost-optimized routing cascade — cheapest capable agent first, escalate on complexity.",
    "tiers": [
      {
        "tier": 1,
        "label": "Free",
-        "agents": [
-          "fenrir",
-          "bezalel",
-          "carnice"
-        ],
+        "agents": ["fenrir", "bezalel", "carnice"],
        "use_for": "Issue triage, code review, local code generation. Default lane for most tasks."
      },
      {
        "tier": 2,
        "label": "Cheap",
-        "agents": [
-          "kimi",
-          "allegro"
-        ],
-        "use_for": "Small scoped edits (kimi \u22643 files), triage decisions and routing (allegro)."
+        "agents": ["kimi", "allegro"],
+        "use_for": "Small scoped edits (kimi ≤3 files), triage decisions and routing (allegro)."
      },
      {
        "tier": 3,
        "label": "Premium / Escalate",
-        "agents": [
-          "ezra"
-        ],
+        "agents": ["ezra"],
        "use_for": "Complex multi-file work, docs, architecture. Escalate only."
      }
    ],
@@ -238,48 +217,22 @@
      "allegro-primus: retired, do not route"
    ]
  },
+
  "task_type_map": {
-    "issue-triage": [
-      "fenrir",
-      "allegro"
-    ],
-    "code-generation": [
-      "carnice",
-      "ezra"
-    ],
-    "code-review": [
-      "bezalel"
-    ],
-    "small-edit": [
-      "kimi"
-    ],
-    "debugging": [
-      "bezalel",
-      "carnice"
-    ],
-    "documentation": [
-      "ezra"
-    ],
-    "architecture": [
-      "ezra"
-    ],
-    "ci-fixes": [
-      "bezalel"
-    ],
-    "pr-review": [
-      "bezalel",
-      "fenrir"
-    ],
-    "triage-routing": [
-      "allegro"
-    ],
-    "devops": [
-      "substratum"
-    ],
-    "background-monitoring": [
-      "bilbobagginshire"
-    ]
+    "issue-triage": ["fenrir", "allegro"],
+    "code-generation": ["carnice", "ezra"],
+    "code-review": ["bezalel"],
+    "small-edit": ["kimi"],
+    "debugging": ["bezalel", "carnice"],
+    "documentation": ["ezra"],
+    "architecture": ["ezra"],
+    "ci-fixes": ["bezalel"],
+    "pr-review": ["bezalel", "fenrir"],
+    "triage-routing": ["allegro"],
+    "devops": ["substratum"],
+    "background-monitoring": ["bilbobagginshire"]
  },
+
  "gaps": [
    {
      "agent": "substratum",
@@ -302,11 +255,12 @@
      "action": "Run wolf evaluation on active agents (#195) to replace vibes-based routing with data."
    }
  ],
+
  "next_actions": [
-    "Assign model to substratum \u2014 Epic #196",
-    "Run wolf evaluation on active agents \u2014 Issue #195",
-    "Remove claw-code from routing cascade \u2014 it is infrastructure, not a destination",
+    "Assign model to substratum — Epic #196",
+    "Run wolf evaluation on active agents — Issue #195",
+    "Remove claw-code from routing cascade — it is infrastructure, not a destination",
    "Enrich kimi's Gitea profile description",
-    "Wire fleet-routing.json into workforce-manager.py \u2014 Epic #204"
+    "Wire fleet-routing.json into workforce-manager.py — Epic #204"
  ]
-}
+}
--- a/fleet/hermes-trismegistus/lane.md
+++ b/fleet/hermes-trismegistus/lane.md
@@ -7,13 +7,13 @@

 ## Role

-Dedicated research and triage wizard. Kimi-native.
+Dedicated reasoning and architecture wizard. Claude-native.

 ## Routing

 Route to Hermes Trismegistus when:
 - Task requires deep architectural reasoning
- Novel problem-solving that benefits from strong reasoning depth
+- Novel problem-solving that benefits from Claude's reasoning depth
 - Planning and design decisions for the fleet
 - Complex multi-step analysis that goes beyond code generation

--- a/portals.json
+++ b/portals.json
@@ -160,7 +160,7 @@
      }
    },
    "agents_present": [
-      "ezra"
+      "claude"
    ],
    "interaction_ready": true
  },
--- a/scripts/cleanup-duplicate-prs.sh
+++ b/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