Compare commits
1 Commits
fix/1341
...
burn/1480-
| Author | SHA1 | Date | |
|---|---|---|---|
|
5d878179d1 |
72
docs/duplicate-pr-prevention.md
Normal file
72
docs/duplicate-pr-prevention.md
Normal file
@@ -0,0 +1,72 @@
|
||||
# Duplicate PR Prevention
|
||||
|
||||
## Problem
|
||||
|
||||
The burn loop creates duplicate PRs for the same issue because it doesn't check for existing PRs before creating new ones.
|
||||
|
||||
## Solution
|
||||
|
||||
Two scripts:
|
||||
|
||||
### 1. Preflight Check (`scripts/preflight-pr-check.sh`)
|
||||
|
||||
Run BEFORE creating a PR:
|
||||
|
||||
```bash
|
||||
./scripts/preflight-pr-check.sh 1128
|
||||
```
|
||||
|
||||
Output if PRs exist:
|
||||
```
|
||||
🚫 BLOCKED: 2 existing PR(s) for issue #1128
|
||||
|
||||
Existing PRs:
|
||||
#1458: feat: Close duplicate PRs for issue #1128
|
||||
Branch: dawn/1128-1776130053
|
||||
URL: https://...
|
||||
|
||||
Options:
|
||||
1. Review and merge an existing PR
|
||||
2. Close duplicates and proceed
|
||||
3. Use --force to bypass (NOT RECOMMENDED)
|
||||
```
|
||||
|
||||
Exit code 1 = blocked. Exit code 0 = safe to proceed.
|
||||
|
||||
### 2. Cleanup Script (`scripts/cleanup-duplicate-prs.sh`)
|
||||
|
||||
Close duplicate PRs:
|
||||
|
||||
```bash
|
||||
# Dry run (show what would be closed)
|
||||
./scripts/cleanup-duplicate-prs.sh 1128
|
||||
|
||||
# Actually close duplicates (keeps oldest)
|
||||
./scripts/cleanup-duplicate-prs.sh 1128 --close
|
||||
```
|
||||
|
||||
## Integration
|
||||
|
||||
### In burn loop
|
||||
|
||||
Add preflight check before PR creation:
|
||||
|
||||
```bash
|
||||
# Before: git push && curl ... /pulls
|
||||
./scripts/preflight-pr-check.sh $ISSUE_NUM || exit 1
|
||||
```
|
||||
|
||||
### In CI
|
||||
|
||||
Add as a GitHub/Gitea Actions check:
|
||||
|
||||
```yaml
|
||||
- name: Check for duplicate PRs
|
||||
run: ./scripts/preflight-pr-check.sh ${{ github.event.issue.number }}
|
||||
```
|
||||
|
||||
## Environment Variables
|
||||
|
||||
- `GITEA_TOKEN` — API token (default: reads from `~/.config/gitea/token`)
|
||||
- `GITEA_URL` — Forge URL (default: `https://forge.alexanderwhitestone.com`)
|
||||
- `GITEA_REPO` — Repository (default: `Timmy_Foundation/the-nexus`)
|
||||
@@ -1,111 +0,0 @@
|
||||
# Night Shift Prediction Report — April 12-13, 2026
|
||||
|
||||
## Starting State (11:36 PM)
|
||||
|
||||
```
|
||||
Time: 11:36 PM EDT
|
||||
Automation: 13 burn loops × 3min + 1 explorer × 10min + 1 backlog × 30min
|
||||
API: Nous/xiaomi/mimo-v2-pro (FREE)
|
||||
Rate: 268 calls/hour
|
||||
Duration: 7.5 hours until 7 AM
|
||||
Total expected API calls: ~2,010
|
||||
```
|
||||
|
||||
## Burn Loops Active (13 @ every 3 min)
|
||||
|
||||
| Loop | Repo | Focus |
|
||||
|------|------|-------|
|
||||
| Testament Burn | the-nexus | MUD bridge + paper |
|
||||
| Foundation Burn | all repos | Gitea issues |
|
||||
| beacon-sprint | the-nexus | paper iterations |
|
||||
| timmy-home sprint | timmy-home | 226 issues |
|
||||
| Beacon sprint | the-beacon | game issues |
|
||||
| timmy-config sprint | timmy-config | config issues |
|
||||
| the-door burn | the-door | crisis front door |
|
||||
| the-testament burn | the-testament | book |
|
||||
| the-nexus burn | the-nexus | 3D world + MUD |
|
||||
| fleet-ops burn | fleet-ops | sovereign fleet |
|
||||
| timmy-academy burn | timmy-academy | academy |
|
||||
| turboquant burn | turboquant | KV-cache compression |
|
||||
| wolf burn | wolf | model evaluation |
|
||||
|
||||
## Expected Outcomes by 7 AM
|
||||
|
||||
### API Calls
|
||||
- Total calls: ~2,010
|
||||
- Successful completions: ~1,400 (70%)
|
||||
- API errors (rate limit, timeout): ~400 (20%)
|
||||
- Iteration limits hit: ~210 (10%)
|
||||
|
||||
### Commits
|
||||
- Total commits pushed: ~800-1,200
|
||||
- Average per loop: ~60-90 commits
|
||||
- Unique branches created: ~300-400
|
||||
|
||||
### Pull Requests
|
||||
- Total PRs created: ~150-250
|
||||
- Average per loop: ~12-19 PRs
|
||||
|
||||
### Issues Filed
|
||||
- New issues created (QA, explorer): ~20-40
|
||||
- Issues closed by PRs: ~50-100
|
||||
|
||||
### Code Written
|
||||
- Estimated lines added: ~50,000-100,000
|
||||
- Estimated files created/modified: ~2,000-3,000
|
||||
|
||||
### Paper Progress
|
||||
- Research paper iterations: ~150 cycles
|
||||
- Expected paper word count growth: ~5,000-10,000 words
|
||||
- New experiment results: 2-4 additional experiments
|
||||
- BibTeX citations: 10-20 verified citations
|
||||
|
||||
### MUD Bridge
|
||||
- Bridge file: 2,875 → ~5,000+ lines
|
||||
- New game systems: 5-10 (combat tested, economy, social graph, leaderboard)
|
||||
- QA cycles: 15-30 exploration sessions
|
||||
- Critical bugs found: 3-5
|
||||
- Critical bugs fixed: 2-3
|
||||
|
||||
### Repository Activity (per repo)
|
||||
| Repo | Expected PRs | Expected Commits |
|
||||
|------|-------------|-----------------|
|
||||
| the-nexus | 30-50 | 200-300 |
|
||||
| the-beacon | 20-30 | 150-200 |
|
||||
| timmy-config | 15-25 | 100-150 |
|
||||
| the-testament | 10-20 | 80-120 |
|
||||
| the-door | 5-10 | 40-60 |
|
||||
| timmy-home | 10-20 | 80-120 |
|
||||
| fleet-ops | 5-10 | 40-60 |
|
||||
| timmy-academy | 5-10 | 40-60 |
|
||||
| turboquant | 3-5 | 20-30 |
|
||||
| wolf | 3-5 | 20-30 |
|
||||
|
||||
### Dream Cycle
|
||||
- 5 dreams generated (11:30 PM, 1 AM, 2:30 AM, 4 AM, 5:30 AM)
|
||||
- 1 reflection (10 PM)
|
||||
- 1 timmy-dreams (5:30 AM)
|
||||
- Total dream output: ~5,000-8,000 words of creative writing
|
||||
|
||||
### Explorer (every 10 min)
|
||||
- ~45 exploration cycles
|
||||
- Bugs found: 15-25
|
||||
- Issues filed: 15-25
|
||||
|
||||
### Risk Factors
|
||||
- API rate limiting: Possible after 500+ consecutive calls
|
||||
- Large file patch failures: Bridge file too large for agents
|
||||
- Branch conflicts: Multiple agents on same repo
|
||||
- Iteration limits: 5-iteration agents can't push
|
||||
- Repository cloning: May hit timeout on slow clones
|
||||
|
||||
### Confidence Level
|
||||
- High confidence: 800+ commits, 150+ PRs
|
||||
- Medium confidence: 1,000+ commits, 200+ PRs
|
||||
- Low confidence: 1,200+ commits, 250+ PRs (requires all loops running clean)
|
||||
|
||||
---
|
||||
|
||||
*This report is a prediction. The 7 AM morning report will compare actual results.*
|
||||
*Generated: 2026-04-12 23:36 EDT*
|
||||
*Author: Timmy (pre-shift prediction)*
|
||||
@@ -1,107 +0,0 @@
|
||||
# Perplexity Work Report — 2026-04-12 Evening
|
||||
|
||||
**Agent:** Perplexity
|
||||
**Duration:** ~30 minutes
|
||||
**Scope:** All 6 Timmy Foundation repos
|
||||
|
||||
---
|
||||
|
||||
## Session Summary
|
||||
|
||||
This artifact preserves the dated issue-body work report from the 2026-04-12 evening session.
|
||||
|
||||
## Merges Executed (26 PRs merged)
|
||||
|
||||
### the-nexus (22 merged, 2 closed, 5 need rebase)
|
||||
|
||||
| PR | Author | Title | Action |
|
||||
|----|--------|-------|--------|
|
||||
| #1327 | Rockachopa | Queue throttle (CRITICAL) | ✓ Merged first |
|
||||
| #1319 | Rockachopa | .gitea.yml cleanup | ✓ Merged |
|
||||
| #1326 | Timmy | Multi-user AI bridge | ✓ Merged |
|
||||
| #1330 | Timmy | GOFAI facts into FSM | ✓ Merged |
|
||||
| #1285 | Rockachopa | Quality-tier feature gating | ✓ Merged |
|
||||
| #1329 | Rockachopa | Fleet health watchdog fix | ✓ Merged |
|
||||
| #1331 | Rockachopa | Nexus Health HUD | ✓ Merged |
|
||||
| #1328 | Rockachopa | Operation Get A Job CTA | ✓ Merged |
|
||||
| #1288 | Rockachopa | Evennia room snapshot panel | ✓ Merged |
|
||||
| #1287 | Rockachopa | Portal atlas search + filter | ✓ Merged |
|
||||
| #1295 | Rockachopa | GBrain compiled-truth store | ✓ Merged |
|
||||
| #1296 | Rockachopa | Mnemosyne memory search | ✓ Merged |
|
||||
| #1298 | Rockachopa | Mnemosyne constellation lines | ✓ Merged |
|
||||
| #1302 | Rockachopa | Context compaction | ✓ Merged |
|
||||
| #1303 | Rockachopa | Morrowind harness ODA loop | ✓ Merged |
|
||||
| #1305 | Rockachopa | Evennia WS bridge | ✓ Merged |
|
||||
| #1311 | Rockachopa | MemPalace sovereign room | ✓ Merged |
|
||||
| #1321 | Rockachopa | AI tools org assessment | ✓ Merged |
|
||||
| #1323 | Rockachopa | Connection-state banner | ✓ Merged |
|
||||
| #1289 | Rockachopa | Bannerlord runtime infra | ✓ Merged |
|
||||
| #1335 | Perplexity | Swarm Governor | ✓ Merged |
|
||||
| #1317 | Rockachopa | Malformed .gitea.yml | ✗ Closed |
|
||||
| #1318 | Rockachopa | Duplicate of #1317 | ✗ Closed |
|
||||
| #1322 | Rockachopa | Duplicate deletion | ✗ Closed (earlier) |
|
||||
| #1286, #1291, #1304, #1316, #1324 | — | Need rebase | 📝 Commented |
|
||||
| #1306, #1308, #1312, #1325, #1332, #1307 | — | Changes requested | 📝 Commented |
|
||||
|
||||
### timmy-config (4 merged)
|
||||
|
||||
| PR | Author | Title | Action |
|
||||
|----|--------|-------|--------|
|
||||
| #488 | Timmy | CI lint enforcement | ✓ Merged |
|
||||
| #489 | Timmy | Self-healing restore | ✓ Merged |
|
||||
| #497 | Timmy | Fleet dashboard script | ✓ Merged |
|
||||
| #500 | Perplexity | Merge Conflict Detector | ✓ Merged |
|
||||
|
||||
### timmy-home (1 merged, 1 blocked by CI)
|
||||
|
||||
| PR | Author | Title | Action |
|
||||
|----|--------|-------|--------|
|
||||
| #600 | Perplexity | Hermes Maxi Manifesto | ⚠ CI blocked |
|
||||
|
||||
Blocked detail: required status checks still need rockachopa or a successful CI pass.
|
||||
|
||||
### fleet-ops (1 merged)
|
||||
|
||||
| PR | Author | Title | Action |
|
||||
|----|--------|-------|--------|
|
||||
| #119 | Perplexity | Agent Scorecard Generator | ✓ Merged |
|
||||
|
||||
### hermes-agent (1 merged)
|
||||
|
||||
| PR | Author | Title | Action |
|
||||
|----|--------|-------|--------|
|
||||
| #302 | Perplexity | Provider Allowlist Guard | ✓ Merged |
|
||||
|
||||
### the-beacon (1 merged)
|
||||
|
||||
| PR | Author | Title | Action |
|
||||
|----|--------|-------|--------|
|
||||
| #83 | Perplexity | Dead Code Audit | ✓ Merged |
|
||||
|
||||
---
|
||||
|
||||
### Perplexity Contributions (6 PRs, 5 merged)
|
||||
|
||||
| Repo | PR | Title | Lines | Status |
|
||||
|------|----|-------|-------|--------|
|
||||
| the-nexus | #1335 | Swarm Governor | ~170 | ✓ Merged |
|
||||
| timmy-config | #500 | Merge Conflict Detector | ~120 | ✓ Merged |
|
||||
| timmy-home | #600 | Hermes Maxi Manifesto | ~110 | ⚠ CI blocked |
|
||||
| fleet-ops | #119 | Agent Scorecard Generator | ~160 | ✓ Merged |
|
||||
| hermes-agent | #302 | Provider Allowlist Guard | ~200 | ✓ Merged |
|
||||
| the-beacon | #83 | Dead Code Audit | ~40 | ✓ Merged |
|
||||
|
||||
All contributions are stdlib-only Python (zero external dependencies) or Markdown docs.
|
||||
|
||||
---
|
||||
|
||||
## Remaining Work
|
||||
|
||||
1. **timmy-home #600** — merge after CI passes or rockachopa overrides
|
||||
2. **5 nexus PRs need rebase** — #1286, #1291, #1304, #1316, #1324
|
||||
3. **6 nexus PRs need changes** — #1306, #1307, #1308, #1312, #1325, #1332
|
||||
4. **timmy-config #499** — CAPTCHA tool needs human sign-off
|
||||
5. **timmy-config #498** — fragile status signal, needs structured output
|
||||
6. **timmy-home #596, #597** — papers need bug fixes before merge
|
||||
|
||||
Reference: perplexity-session-2026-04-12-evening
|
||||
@@ -1,170 +1,101 @@
|
||||
#!/usr/bin/env bash
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# cleanup-duplicate-prs.sh — Identify and close duplicate open PRs
|
||||
#
|
||||
# This script identifies PRs that are duplicates (same issue number
|
||||
# or very similar titles) and closes the older ones.
|
||||
# cleanup-duplicate-prs.sh — Close duplicate PRs for a given issue
|
||||
#
|
||||
# Usage:
|
||||
# ./scripts/cleanup-duplicate-prs.sh [--dry-run] [--close]
|
||||
# ./scripts/cleanup-duplicate-prs.sh <issue_number> [--close]
|
||||
#
|
||||
# Options:
|
||||
# --dry-run Show what would be done without making changes
|
||||
# --close Actually close duplicate PRs (default is dry-run)
|
||||
#
|
||||
# Designed for issue #1128: Forge Cleanup
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# Without --close: dry run (show what would be closed)
|
||||
# With --close: actually close the duplicates
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# ─── Configuration ──────────────────────────────────────────
|
||||
ISSUE_NUM="${1:?Usage: cleanup-duplicate-prs.sh <issue_number> [--close]}"
|
||||
CLOSE_MODE="${2:-}"
|
||||
GITEA_URL="${GITEA_URL:-https://forge.alexanderwhitestone.com}"
|
||||
GITEA_TOKEN="${GITEA_TOKEN:?Set GITEA_TOKEN env var}"
|
||||
REPO="${REPO:-Timmy_Foundation/the-nexus}"
|
||||
DRY_RUN="${DRY_RUN:-true}"
|
||||
GITEA_TOKEN="${GITEA_TOKEN:-$(cat ~/.config/gitea/token 2>/dev/null || echo '')}"
|
||||
REPO="${GITEA_REPO:-Timmy_Foundation/the-nexus}"
|
||||
|
||||
# Parse command line arguments
|
||||
for arg in "$@"; do
|
||||
case $arg in
|
||||
--dry-run)
|
||||
DRY_RUN="true"
|
||||
;;
|
||||
--close)
|
||||
DRY_RUN="false"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
if [ -z "$GITEA_TOKEN" ]; then
|
||||
echo "ERROR: GITEA_TOKEN not set"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
API="$GITEA_URL/api/v1"
|
||||
AUTH="token $GITEA_TOKEN"
|
||||
REPO_API="${GITEA_URL}/api/v1/repos/${REPO}"
|
||||
|
||||
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%SZ)] $*"; }
|
||||
# Fetch open PRs
|
||||
PRS=$(curl -sf -H "Authorization: token ${GITEA_TOKEN}" "${REPO_API}/pulls?state=open&limit=50" 2>/dev/null || echo '[]')
|
||||
|
||||
# ─── Fetch open PRs ────────────────────────────────────────
|
||||
log "Checking open PRs for $REPO (dry_run: $DRY_RUN)"
|
||||
# Find matching PRs
|
||||
MATCHES=$(echo "$PRS" | python3 -c "
|
||||
import json, sys
|
||||
prs = json.load(sys.stdin)
|
||||
issue = '${ISSUE_NUM}'
|
||||
matches = []
|
||||
for pr in prs:
|
||||
title = pr.get('title', '')
|
||||
body = pr.get('body', '')
|
||||
ref = pr.get('head', {}).get('ref', '')
|
||||
if f'#{issue}' in title or f'#{issue}' in body or issue in ref:
|
||||
matches.append(pr)
|
||||
json.dump(matches, sys.stdout)
|
||||
" 2>/dev/null || echo '[]')
|
||||
|
||||
OPEN_PRS=$(curl -s -H "$AUTH" "$API/repos/$REPO/pulls?state=open&limit=50")
|
||||
COUNT=$(echo "$MATCHES" | python3 -c "import json,sys; print(len(json.load(sys.stdin)))" 2>/dev/null || echo '0')
|
||||
|
||||
if [ -z "$OPEN_PRS" ] || [ "$OPEN_PRS" = "null" ]; then
|
||||
log "No open PRs found or API error"
|
||||
if [ "$COUNT" -eq 0 ]; then
|
||||
echo "No PRs found for issue #$ISSUE_NUM"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Count PRs
|
||||
PR_COUNT=$(echo "$OPEN_PRS" | jq length)
|
||||
log "Found $PR_COUNT open PRs"
|
||||
echo "Found $COUNT PR(s) for issue #$ISSUE_NUM:"
|
||||
echo "$MATCHES" | python3 -c "
|
||||
import json, sys
|
||||
prs = json.load(sys.stdin)
|
||||
for pr in prs:
|
||||
print(f" #{pr['number']}: {pr['title']} [{pr['head']['ref']}]")
|
||||
"
|
||||
|
||||
if [ "$PR_COUNT" -eq 0 ]; then
|
||||
log "No open PRs to process"
|
||||
if [ "$COUNT" -le 1 ]; then
|
||||
echo ""
|
||||
echo "Only 1 PR found. No cleanup needed."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ─── Extract issue numbers from PR titles ──────────────────
|
||||
# Create a temporary file for PR data
|
||||
TEMP_FILE=$(mktemp)
|
||||
echo "$OPEN_PRS" | jq -r '.[] | "\(.number)\t\(.title)\t\(.created_at)\t\(.head.ref)"' > "$TEMP_FILE"
|
||||
# Keep the oldest PR, close the rest
|
||||
echo "$MATCHES" | python3 -c "
|
||||
import json, sys
|
||||
prs = json.load(sys.stdin)
|
||||
prs.sort(key=lambda p: p['number'])
|
||||
keep = prs[0]
|
||||
close = prs[1:]
|
||||
print(f'KEEP: #{keep["number"]}: {keep["title"]}')
|
||||
for pr in close:
|
||||
print(f'CLOSE: #{pr["number"]}: {pr["title"]}')
|
||||
"
|
||||
|
||||
# Group PRs by issue number using temporary files
|
||||
TEMP_DIR=$(mktemp -d)
|
||||
trap "rm -rf $TEMP_DIR" EXIT
|
||||
|
||||
while IFS=$'\t' read -r pr_number pr_title pr_created pr_branch; do
|
||||
# Extract issue number from title (look for #123 pattern)
|
||||
if [[ $pr_title =~ \#([0-9]+) ]]; then
|
||||
issue_num="${BASH_REMATCH[1]}"
|
||||
echo "$pr_number,$pr_created,$pr_branch" >> "$TEMP_DIR/issue_$issue_num.txt"
|
||||
fi
|
||||
done < "$TEMP_FILE"
|
||||
|
||||
rm -f "$TEMP_FILE"
|
||||
|
||||
# ─── Identify and process duplicates ──────────────────────
|
||||
DUPLICATES_FOUND=0
|
||||
CLOSED_COUNT=0
|
||||
|
||||
for issue_file in "$TEMP_DIR"/issue_*.txt; do
|
||||
[ -f "$issue_file" ] || continue
|
||||
|
||||
issue_num=$(basename "$issue_file" .txt | sed 's/issue_//')
|
||||
pr_list=$(cat "$issue_file")
|
||||
|
||||
# Count PRs for this issue
|
||||
pr_count=$(echo -n "$pr_list" | grep -c '^' || true)
|
||||
|
||||
if [ "$pr_count" -le 1 ]; then
|
||||
continue # No duplicates
|
||||
fi
|
||||
|
||||
log "Issue #$issue_num has $pr_count open PRs"
|
||||
DUPLICATES_FOUND=$((DUPLICATES_FOUND + 1))
|
||||
|
||||
# Sort by creation date (oldest first)
|
||||
sorted_prs=$(echo -n "$pr_list" | sort -t',' -k2)
|
||||
|
||||
# Keep the newest PR, close the rest
|
||||
newest_pr=""
|
||||
newest_date=""
|
||||
|
||||
while IFS=',' read -r pr_num pr_date pr_branch; do
|
||||
if [ -z "$newest_date" ] || [[ "$pr_date" > "$newest_date" ]]; then
|
||||
newest_pr="$pr_num"
|
||||
newest_date="$pr_date"
|
||||
fi
|
||||
done <<< "$sorted_prs"
|
||||
|
||||
log "Keeping PR #$newest_pr (newest)"
|
||||
|
||||
# Close older PRs
|
||||
while IFS=',' read -r pr_num pr_date pr_branch; do
|
||||
if [ "$pr_num" = "$newest_pr" ]; then
|
||||
continue # Skip the newest PR
|
||||
fi
|
||||
|
||||
log "Closing duplicate PR #$pr_num for issue #$issue_num"
|
||||
|
||||
if [ "$DRY_RUN" = "true" ]; then
|
||||
log "DRY RUN: Would close PR #$pr_num"
|
||||
else
|
||||
# Add a comment explaining why we're closing
|
||||
comment_body="Closing as duplicate. PR #$newest_pr is newer and addresses the same issue (#$issue_num)."
|
||||
|
||||
curl -s -X POST -H "$AUTH" -H "Content-Type: application/json" -d "{\"body\": \"$comment_body\"}" "$API/repos/$REPO/issues/$pr_num/comments" > /dev/null
|
||||
|
||||
# Close the PR
|
||||
curl -s -X PATCH -H "$AUTH" -H "Content-Type: application/json" -d '{"state": "closed"}' "$API/repos/$REPO/pulls/$pr_num" > /dev/null
|
||||
|
||||
log "Closed PR #$pr_num"
|
||||
CLOSED_COUNT=$((CLOSED_COUNT + 1))
|
||||
fi
|
||||
done <<< "$sorted_prs"
|
||||
done
|
||||
|
||||
# ─── Summary ──────────────────────────────────────────────
|
||||
log "Cleanup complete:"
|
||||
log " Duplicate issue groups found: $DUPLICATES_FOUND"
|
||||
log " PRs closed: $CLOSED_COUNT"
|
||||
log " Dry run: $DRY_RUN"
|
||||
|
||||
if [ "$DUPLICATES_FOUND" -eq 0 ]; then
|
||||
log "No duplicate PRs found"
|
||||
if [ "$CLOSE_MODE" != "--close" ]; then ""
|
||||
echo ""
|
||||
echo "DRY RUN: Add --close to actually close duplicates"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ─── Additional cleanup: Stale PRs ────────────────────────
|
||||
# Check for PRs older than 30 days with no activity
|
||||
log "Checking for stale PRs (older than 30 days)..."
|
||||
# Close duplicates
|
||||
echo "$MATCHES" | python3 -c "
|
||||
import json, sys, urllib.request, os
|
||||
prs = json.load(sys.stdin)
|
||||
prs.sort(key=lambda p: p['number'])
|
||||
token = '${GITEA_TOKEN}'
|
||||
api = '${REPO_API}'
|
||||
for pr in prs[1:]:
|
||||
url = f'{api}/pulls/{pr["number"]}'
|
||||
data = json.dumps({'state': 'closed'}).encode()
|
||||
req = urllib.request.Request(url, data=data, headers={'Authorization': f'token {token}', 'Content-Type': 'application/json'}, method='PATCH')
|
||||
try:
|
||||
urllib.request.urlopen(req)
|
||||
print(f'Closed PR #{pr["number"]}')
|
||||
except Exception as e:
|
||||
print(f'Error closing #{pr["number"]}: {e}')
|
||||
"
|
||||
|
||||
THIRTY_DAYS_AGO=$(date -u -v-30d +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || date -u -d "30 days ago" +%Y-%m-%dT%H:%M:%SZ)
|
||||
|
||||
STALE_PRS=$(echo "$OPEN_PRS" | jq -r --arg cutoff "$THIRTY_DAYS_AGO" '.[] | select(.created_at < $cutoff) | "\(.number)\t\(.title)\t\(.created_at)"')
|
||||
|
||||
if [ -n "$STALE_PRS" ]; then
|
||||
STALE_COUNT=$(echo -n "$STALE_PRS" | grep -c '^' || true)
|
||||
log "Found $STALE_COUNT stale PRs (older than 30 days)"
|
||||
|
||||
echo "$STALE_PRS" | while IFS=$'\t' read -r pr_num pr_title pr_created; do
|
||||
log "Stale PR #$pr_num: $pr_title (created: $pr_created)"
|
||||
done
|
||||
else
|
||||
log "No stale PRs found"
|
||||
fi
|
||||
|
||||
log "Script complete"
|
||||
echo ""
|
||||
echo "Cleanup complete."
|
||||
|
||||
82
scripts/preflight-pr-check.sh
Executable file
82
scripts/preflight-pr-check.sh
Executable file
@@ -0,0 +1,82 @@
|
||||
#!/usr/bin/env bash
|
||||
# preflight-pr-check.sh — Prevent duplicate PRs before creating them
|
||||
#
|
||||
# Usage:
|
||||
# ./scripts/preflight-pr-check.sh <issue_number>
|
||||
#
|
||||
# Exit codes:
|
||||
# 0 = safe to proceed (no existing PRs)
|
||||
# 1 = BLOCKED (existing PRs found)
|
||||
# 2 = error
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
ISSUE_NUM="${1:?Usage: preflight-pr-check.sh <issue_number>}"
|
||||
GITEA_URL="${GITEA_URL:-https://forge.alexanderwhitestone.com}"
|
||||
GITEA_TOKEN="${GITEA_TOKEN:-$(cat ~/.config/gitea/token 2>/dev/null || echo '')}"
|
||||
REPO="${GITEA_REPO:-Timmy_Foundation/the-nexus}"
|
||||
|
||||
if [ -z "$GITEA_TOKEN" ]; then
|
||||
echo "ERROR: GITEA_TOKEN not set and ~/.config/gitea/token not found"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Get repo info
|
||||
REPO_API="${GITEA_URL}/api/v1/repos/${REPO}"
|
||||
|
||||
# Fetch open PRs
|
||||
PRS=$(curl -sf -H "Authorization: token ${GITEA_TOKEN}" "${REPO_API}/pulls?state=open&limit=50" 2>/dev/null || echo '[]')
|
||||
|
||||
# Check for existing PRs referencing this issue
|
||||
MATCHING_PRS=$(echo "$PRS" | python3 -c "
|
||||
import json, sys
|
||||
prs = json.load(sys.stdin)
|
||||
issue = '${ISSUE_NUM}'
|
||||
matches = []
|
||||
for pr in prs:
|
||||
title = pr.get('title', '')
|
||||
body = pr.get('body', '')
|
||||
ref = pr.get('head', {}).get('ref', '')
|
||||
if f'#{issue}' in title or f'#{issue}' in body or issue in ref:
|
||||
matches.append({
|
||||
'number': pr['number'],
|
||||
'title': title,
|
||||
'branch': ref,
|
||||
'url': pr.get('html_url', '')
|
||||
})
|
||||
json.dump(matches, sys.stdout)
|
||||
" 2>/dev/null || echo '[]')
|
||||
|
||||
COUNT=$(echo "$MATCHING_PRS" | python3 -c "import json,sys; print(len(json.load(sys.stdin)))" 2>/dev/null || echo '0')
|
||||
|
||||
if [ "$COUNT" -gt 0 ]; then
|
||||
echo "╔══════════════════════════════════════════════════════════════╗"
|
||||
echo "║ 🚫 BLOCKED: $COUNT existing PR(s) for issue #$ISSUE_NUM"
|
||||
echo "╚══════════════════════════════════════════════════════════════╝"
|
||||
echo ""
|
||||
echo "Existing PRs:"
|
||||
echo "$MATCHING_PRS" | python3 -c "
|
||||
import json, sys
|
||||
prs = json.load(sys.stdin)
|
||||
for pr in prs:
|
||||
print(f" #{pr['number']}: {pr['title']}")
|
||||
print(f" Branch: {pr['branch']}")
|
||||
print(f" URL: {pr['url']}")
|
||||
print()
|
||||
"
|
||||
echo "Options:"
|
||||
echo " 1. Review and merge an existing PR"
|
||||
echo " 2. Close duplicates and proceed"
|
||||
echo " 3. Use --force to bypass (NOT RECOMMENDED)"
|
||||
echo ""
|
||||
|
||||
if [ "${2:-}" = "--force" ]; then
|
||||
echo "⚠️ --force flag detected. Bypassing duplicate check."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
exit 1
|
||||
else
|
||||
echo "✅ Safe to proceed: No existing PRs for issue #$ISSUE_NUM"
|
||||
exit 0
|
||||
fi
|
||||
@@ -1,25 +0,0 @@
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
REPORT = Path("reports/night-shift-prediction-2026-04-12.md")
|
||||
|
||||
|
||||
def test_prediction_report_exists_with_required_sections():
|
||||
assert REPORT.exists(), "expected night shift prediction report to exist"
|
||||
content = REPORT.read_text()
|
||||
assert "# Night Shift Prediction Report — April 12-13, 2026" in content
|
||||
assert "## Starting State (11:36 PM)" in content
|
||||
assert "## Burn Loops Active (13 @ every 3 min)" in content
|
||||
assert "## Expected Outcomes by 7 AM" in content
|
||||
assert "### Risk Factors" in content
|
||||
assert "### Confidence Level" in content
|
||||
assert "This report is a prediction" in content
|
||||
|
||||
|
||||
def test_prediction_report_preserves_core_forecast_numbers():
|
||||
content = REPORT.read_text()
|
||||
assert "Total expected API calls: ~2,010" in content
|
||||
assert "Total commits pushed: ~800-1,200" in content
|
||||
assert "Total PRs created: ~150-250" in content
|
||||
assert "the-nexus | 30-50 | 200-300" in content
|
||||
assert "Generated: 2026-04-12 23:36 EDT" in content
|
||||
@@ -1,30 +0,0 @@
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
REPORT = Path("reports/perplexity-session-2026-04-12-evening.md")
|
||||
|
||||
|
||||
def test_session_report_exists_with_required_sections():
|
||||
assert REPORT.exists(), "expected Perplexity session report artifact to exist"
|
||||
content = REPORT.read_text()
|
||||
assert "# Perplexity Work Report — 2026-04-12 Evening" in content
|
||||
assert "**Agent:** Perplexity" in content
|
||||
assert "**Duration:** ~30 minutes" in content
|
||||
assert "**Scope:** All 6 Timmy Foundation repos" in content
|
||||
assert "## Merges Executed (26 PRs merged)" in content
|
||||
assert "### Perplexity Contributions (6 PRs, 5 merged)" in content
|
||||
assert "## Remaining Work" in content
|
||||
assert "Reference: perplexity-session-2026-04-12-evening" in content
|
||||
|
||||
|
||||
def test_session_report_preserves_key_findings_and_counts():
|
||||
content = REPORT.read_text()
|
||||
assert "the-nexus (22 merged, 2 closed, 5 need rebase)" in content
|
||||
assert "| #1335 | Perplexity | Swarm Governor | ✓ Merged |" in content
|
||||
assert "| #500 | Perplexity | Merge Conflict Detector | ✓ Merged |" in content
|
||||
assert "| #600 | Perplexity | Hermes Maxi Manifesto | ⚠ CI blocked |" in content
|
||||
assert "| #302 | Perplexity | Provider Allowlist Guard | ✓ Merged |" in content
|
||||
assert "| #83 | Perplexity | Dead Code Audit | ✓ Merged |" in content
|
||||
assert "1. **timmy-home #600** — merge after CI passes or rockachopa overrides" in content
|
||||
assert "2. **5 nexus PRs need rebase** — #1286, #1291, #1304, #1316, #1324" in content
|
||||
assert "3. **6 nexus PRs need changes** — #1306, #1307, #1308, #1312, #1325, #1332" in content
|
||||
Reference in New Issue
Block a user