Compare commits
8 Commits
burn/1480-
...
fix/1598
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68d94a4967 | ||
| 27aa29f9c8 | |||
| 39cf447ee0 | |||
| fe5b9c8b75 | |||
| 871188ec12 | |||
| 9482403a23 | |||
| bd0497b998 | |||
|
|
4ab84a59ab |
@@ -6,3 +6,4 @@ rules:
|
||||
require_ci_to_merge: false # CI runner dead (issue #915)
|
||||
block_force_pushes: true
|
||||
block_deletions: true
|
||||
block_on_outdated_branch: true
|
||||
|
||||
1
.github/BRANCH_PROTECTION.md
vendored
1
.github/BRANCH_PROTECTION.md
vendored
@@ -12,6 +12,7 @@ All repositories must enforce these rules on the `main` branch:
|
||||
| Require CI to pass | ⚠ Conditional | Only where CI exists |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
| Require branch up-to-date before merge | ✅ Enabled | Surface conflicts before merge and force contributors to rebase |
|
||||
|
||||
## Default Reviewer Assignments
|
||||
|
||||
|
||||
162
SECURITY.md
Normal file
162
SECURITY.md
Normal file
@@ -0,0 +1,162 @@
|
||||
# Security Policy
|
||||
|
||||
## Overview
|
||||
|
||||
The Nexus is a sovereign AI agent system that prioritizes security, privacy, and local-first operation. This document outlines our security practices and how to report vulnerabilities.
|
||||
|
||||
## Security Principles
|
||||
|
||||
1. **Local-first**: All data and processing stays on the user's machine by default
|
||||
2. **Minimal attack surface**: Expose only what's necessary
|
||||
3. **Defense in depth**: Multiple layers of security controls
|
||||
4. **Transparency**: Open source, auditable code
|
||||
5. **User sovereignty**: Users control their data and connections
|
||||
|
||||
## Recent Security Improvements
|
||||
|
||||
### WebSocket Gateway Security (Issue #1504, #1514)
|
||||
|
||||
**Problem**: WebSocket gateway was exposed on `0.0.0.0` without authentication.
|
||||
|
||||
**Solution**:
|
||||
- **Localhost binding by default**: Gateway now binds to `127.0.0.1` by default
|
||||
- **Token authentication**: Optional token-based authentication via `NEXUS_WS_TOKEN`
|
||||
- **Rate limiting**: Connection and message rate limiting
|
||||
- **Configuration via environment variables**:
|
||||
- `NEXUS_WS_HOST`: Host to bind to (default: `127.0.0.1`)
|
||||
- `NEXUS_WS_PORT`: Port to listen on (default: `8765`)
|
||||
- `NEXUS_WS_TOKEN`: Authentication token (empty = no auth)
|
||||
|
||||
### Branch Protection
|
||||
|
||||
**Policy**: All repositories enforce branch protection rules on `main`:
|
||||
- Require pull requests for all changes
|
||||
- Require 1 approval before merge
|
||||
- Dismiss stale approvals on new commits
|
||||
- Block force pushes
|
||||
- Block branch deletion
|
||||
|
||||
### Command Injection Prevention
|
||||
|
||||
**Problem**: Shell injection vulnerabilities in commit messages and Electron IPC.
|
||||
|
||||
**Solution**:
|
||||
- Input validation and sanitization
|
||||
- Use of parameterized commands
|
||||
- Avoid shell execution where possible
|
||||
- Use of safe APIs (e.g., `child_process.execFile` instead of `child_process.exec`)
|
||||
|
||||
### ChromaDB Telemetry Disabled
|
||||
|
||||
**Problem**: ChromaDB enables anonymous telemetry by default, leaking usage patterns.
|
||||
|
||||
**Solution**:
|
||||
- Disabled telemetry in all client creation paths
|
||||
- Added `anonymized_telemetry=False` to all ChromaDB client instances
|
||||
|
||||
## Security Configuration
|
||||
|
||||
### Environment Variables
|
||||
|
||||
| Variable | Default | Description |
|
||||
|----------|---------|-------------|
|
||||
| `NEXUS_WS_HOST` | `127.0.0.1` | WebSocket gateway host |
|
||||
| `NEXUS_WS_PORT` | `8765` | WebSocket gateway port |
|
||||
| `NEXUS_WS_TOKEN` | (empty) | Authentication token |
|
||||
| `GITEA_TOKEN` | (required) | Gitea API token |
|
||||
| `GITEA_URL` | `https://forge.alexanderwhitestone.com` | Gitea instance URL |
|
||||
|
||||
### Secure Deployment
|
||||
|
||||
For production deployments:
|
||||
|
||||
1. **Use authentication**:
|
||||
```bash
|
||||
export NEXUS_WS_TOKEN=$(openssl rand -hex 32)
|
||||
```
|
||||
|
||||
2. **Bind to localhost** (default):
|
||||
```bash
|
||||
export NEXUS_WS_HOST=127.0.0.1
|
||||
```
|
||||
|
||||
3. **Use reverse proxy** for external access:
|
||||
```nginx
|
||||
# nginx example
|
||||
location /ws {
|
||||
proxy_pass http://127.0.0.1:8765;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
}
|
||||
```
|
||||
|
||||
4. **Enable HTTPS** for external access
|
||||
|
||||
## Reporting Vulnerabilities
|
||||
|
||||
### Responsible Disclosure
|
||||
|
||||
If you discover a security vulnerability, please follow responsible disclosure:
|
||||
|
||||
1. **Do NOT** create a public issue
|
||||
2. **Email**: security@timmy.foundation (or contact Alexander directly)
|
||||
3. **Include**:
|
||||
- Description of the vulnerability
|
||||
- Steps to reproduce
|
||||
- Potential impact
|
||||
- Suggested fix (if any)
|
||||
|
||||
### Response Timeline
|
||||
|
||||
- **Acknowledgment**: Within 24 hours
|
||||
- **Assessment**: Within 72 hours
|
||||
- **Fix**: Within 7 days for critical issues
|
||||
- **Disclosure**: After fix is deployed
|
||||
|
||||
## Security Best Practices
|
||||
|
||||
### For Users
|
||||
|
||||
1. **Keep software updated**: Regularly update The Nexus and dependencies
|
||||
2. **Use strong tokens**: Generate random, long tokens for authentication
|
||||
3. **Limit exposure**: Only expose services that need external access
|
||||
4. **Monitor logs**: Check logs for suspicious activity
|
||||
5. **Backup regularly**: Keep backups of important data
|
||||
|
||||
### For Developers
|
||||
|
||||
1. **Input validation**: Always validate and sanitize user input
|
||||
2. **Parameterized queries**: Use parameterized queries for database access
|
||||
3. **Least privilege**: Run with minimal required permissions
|
||||
4. **Secure defaults**: Default to secure configurations
|
||||
5. **Code review**: All changes require code review
|
||||
|
||||
### For Deployment
|
||||
|
||||
1. **Network segmentation**: Isolate services in network segments
|
||||
2. **Firewall rules**: Restrict access to necessary ports only
|
||||
3. **Regular updates**: Keep OS and dependencies updated
|
||||
4. **Monitoring**: Implement logging and monitoring
|
||||
5. **Backup strategy**: Regular, tested backups
|
||||
|
||||
## Security Audit Log
|
||||
|
||||
| Date | Issue | Description | Status |
|
||||
|------|-------|-------------|--------|
|
||||
| 2026-04-15 | #1504 | WebSocket gateway exposed on 0.0.0.0 | ✅ Fixed |
|
||||
| 2026-04-15 | #1514 | WebSocket security improvements | ✅ Fixed |
|
||||
| 2026-04-15 | #1423 | Command injection in Electron IPC | ✅ Fixed |
|
||||
| 2026-04-15 | #1430 | Shell injection in commit messages | ✅ Fixed |
|
||||
| 2026-04-15 | #1427 | ChromaDB telemetry enabled | ✅ Fixed |
|
||||
|
||||
## Contact
|
||||
|
||||
- **Security Issues**: security@timmy.foundation
|
||||
- **General Issues**: Create an issue on Gitea
|
||||
- **Emergency**: Contact Alexander directly
|
||||
|
||||
## License
|
||||
|
||||
This security policy is part of The Nexus project and is subject to the same license.
|
||||
@@ -1,72 +0,0 @@
|
||||
# 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`)
|
||||
111
reports/night-shift-prediction-2026-04-12.md
Normal file
111
reports/night-shift-prediction-2026-04-12.md
Normal file
@@ -0,0 +1,111 @@
|
||||
# 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,101 +1,170 @@
|
||||
#!/usr/bin/env bash
|
||||
# cleanup-duplicate-prs.sh — Close duplicate PRs for a given issue
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# 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.
|
||||
#
|
||||
# Usage:
|
||||
# ./scripts/cleanup-duplicate-prs.sh <issue_number> [--close]
|
||||
# ./scripts/cleanup-duplicate-prs.sh [--dry-run] [--close]
|
||||
#
|
||||
# Without --close: dry run (show what would be closed)
|
||||
# With --close: actually close the duplicates
|
||||
|
||||
# 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
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
set -euo pipefail
|
||||
|
||||
ISSUE_NUM="${1:?Usage: cleanup-duplicate-prs.sh <issue_number> [--close]}"
|
||||
CLOSE_MODE="${2:-}"
|
||||
# ─── Configuration ──────────────────────────────────────────
|
||||
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}"
|
||||
GITEA_TOKEN="${GITEA_TOKEN:?Set GITEA_TOKEN env var}"
|
||||
REPO="${REPO:-Timmy_Foundation/the-nexus}"
|
||||
DRY_RUN="${DRY_RUN:-true}"
|
||||
|
||||
if [ -z "$GITEA_TOKEN" ]; then
|
||||
echo "ERROR: GITEA_TOKEN not set"
|
||||
exit 1
|
||||
fi
|
||||
# Parse command line arguments
|
||||
for arg in "$@"; do
|
||||
case $arg in
|
||||
--dry-run)
|
||||
DRY_RUN="true"
|
||||
;;
|
||||
--close)
|
||||
DRY_RUN="false"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
REPO_API="${GITEA_URL}/api/v1/repos/${REPO}"
|
||||
API="$GITEA_URL/api/v1"
|
||||
AUTH="token $GITEA_TOKEN"
|
||||
|
||||
# Fetch open PRs
|
||||
PRS=$(curl -sf -H "Authorization: token ${GITEA_TOKEN}" "${REPO_API}/pulls?state=open&limit=50" 2>/dev/null || echo '[]')
|
||||
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%SZ)] $*"; }
|
||||
|
||||
# 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 '[]')
|
||||
# ─── Fetch open PRs ────────────────────────────────────────
|
||||
log "Checking open PRs for $REPO (dry_run: $DRY_RUN)"
|
||||
|
||||
COUNT=$(echo "$MATCHES" | python3 -c "import json,sys; print(len(json.load(sys.stdin)))" 2>/dev/null || echo '0')
|
||||
OPEN_PRS=$(curl -s -H "$AUTH" "$API/repos/$REPO/pulls?state=open&limit=50")
|
||||
|
||||
if [ "$COUNT" -eq 0 ]; then
|
||||
echo "No PRs found for issue #$ISSUE_NUM"
|
||||
if [ -z "$OPEN_PRS" ] || [ "$OPEN_PRS" = "null" ]; then
|
||||
log "No open PRs found or API error"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
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']}]")
|
||||
"
|
||||
# Count PRs
|
||||
PR_COUNT=$(echo "$OPEN_PRS" | jq length)
|
||||
log "Found $PR_COUNT open PRs"
|
||||
|
||||
if [ "$COUNT" -le 1 ]; then
|
||||
echo ""
|
||||
echo "Only 1 PR found. No cleanup needed."
|
||||
if [ "$PR_COUNT" -eq 0 ]; then
|
||||
log "No open PRs to process"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# 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"]}')
|
||||
"
|
||||
# ─── 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"
|
||||
|
||||
if [ "$CLOSE_MODE" != "--close" ]; then ""
|
||||
echo ""
|
||||
echo "DRY RUN: Add --close to actually close duplicates"
|
||||
exit 0
|
||||
# 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"
|
||||
fi
|
||||
|
||||
# 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}')
|
||||
"
|
||||
# ─── Additional cleanup: Stale PRs ────────────────────────
|
||||
# Check for PRs older than 30 days with no activity
|
||||
log "Checking for stale PRs (older than 30 days)..."
|
||||
|
||||
echo ""
|
||||
echo "Cleanup complete."
|
||||
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"
|
||||
|
||||
@@ -1,82 +0,0 @@
|
||||
#!/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
|
||||
@@ -4,48 +4,61 @@ Sync branch protection rules from .gitea/branch-protection/*.yml to Gitea.
|
||||
Correctly uses the Gitea 1.25+ API (not GitHub-style).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
import yaml
|
||||
|
||||
GITEA_URL = os.getenv("GITEA_URL", "https://forge.alexanderwhitestone.com")
|
||||
GITEA_TOKEN = os.getenv("GITEA_TOKEN", "")
|
||||
ORG = "Timmy_Foundation"
|
||||
CONFIG_DIR = ".gitea/branch-protection"
|
||||
PROJECT_ROOT = Path(__file__).resolve().parent.parent
|
||||
CONFIG_DIR = PROJECT_ROOT / ".gitea" / "branch-protection"
|
||||
|
||||
|
||||
def api_request(method: str, path: str, payload: dict | None = None) -> dict:
|
||||
url = f"{GITEA_URL}/api/v1{path}"
|
||||
data = json.dumps(payload).encode() if payload else None
|
||||
req = urllib.request.Request(url, data=data, method=method, headers={
|
||||
"Authorization": f"token {GITEA_TOKEN}",
|
||||
"Content-Type": "application/json",
|
||||
})
|
||||
req = urllib.request.Request(
|
||||
url,
|
||||
data=data,
|
||||
method=method,
|
||||
headers={
|
||||
"Authorization": f"token {GITEA_TOKEN}",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
)
|
||||
with urllib.request.urlopen(req, timeout=30) as resp:
|
||||
return json.loads(resp.read().decode())
|
||||
|
||||
|
||||
def apply_protection(repo: str, rules: dict) -> bool:
|
||||
branch = rules.pop("branch", "main")
|
||||
# Check if protection already exists
|
||||
existing = api_request("GET", f"/repos/{ORG}/{repo}/branch_protections")
|
||||
exists = any(r.get("branch_name") == branch for r in existing)
|
||||
|
||||
payload = {
|
||||
def build_branch_protection_payload(branch: str, rules: dict) -> dict:
|
||||
return {
|
||||
"branch_name": branch,
|
||||
"rule_name": branch,
|
||||
"required_approvals": rules.get("required_approvals", 1),
|
||||
"block_on_rejected_reviews": rules.get("block_on_rejected_reviews", True),
|
||||
"dismiss_stale_approvals": rules.get("dismiss_stale_approvals", True),
|
||||
"block_deletions": rules.get("block_deletions", True),
|
||||
"block_force_push": rules.get("block_force_push", True),
|
||||
"block_force_push": rules.get("block_force_push", rules.get("block_force_pushes", True)),
|
||||
"block_admin_merge_override": rules.get("block_admin_merge_override", True),
|
||||
"enable_status_check": rules.get("require_ci_to_merge", False),
|
||||
"status_check_contexts": rules.get("status_check_contexts", []),
|
||||
"block_on_outdated_branch": rules.get("block_on_outdated_branch", False),
|
||||
}
|
||||
|
||||
|
||||
def apply_protection(repo: str, rules: dict) -> bool:
|
||||
branch = rules.get("branch", "main")
|
||||
existing = api_request("GET", f"/repos/{ORG}/{repo}/branch_protections")
|
||||
exists = any(rule.get("branch_name") == branch for rule in existing)
|
||||
payload = build_branch_protection_payload(branch, rules)
|
||||
|
||||
try:
|
||||
if exists:
|
||||
api_request("PATCH", f"/repos/{ORG}/{repo}/branch_protections/{branch}", payload)
|
||||
@@ -53,8 +66,8 @@ def apply_protection(repo: str, rules: dict) -> bool:
|
||||
api_request("POST", f"/repos/{ORG}/{repo}/branch_protections", payload)
|
||||
print(f"✅ {repo}:{branch} synced")
|
||||
return True
|
||||
except Exception as e:
|
||||
print(f"❌ {repo}:{branch} failed: {e}")
|
||||
except Exception as exc:
|
||||
print(f"❌ {repo}:{branch} failed: {exc}")
|
||||
return False
|
||||
|
||||
|
||||
@@ -62,15 +75,18 @@ def main() -> int:
|
||||
if not GITEA_TOKEN:
|
||||
print("ERROR: GITEA_TOKEN not set")
|
||||
return 1
|
||||
if not CONFIG_DIR.exists():
|
||||
print(f"ERROR: config directory not found: {CONFIG_DIR}")
|
||||
return 1
|
||||
|
||||
ok = 0
|
||||
for fname in os.listdir(CONFIG_DIR):
|
||||
if not fname.endswith(".yml"):
|
||||
continue
|
||||
repo = fname[:-4]
|
||||
with open(os.path.join(CONFIG_DIR, fname)) as f:
|
||||
cfg = yaml.safe_load(f)
|
||||
if apply_protection(repo, cfg.get("rules", {})):
|
||||
for cfg_path in sorted(CONFIG_DIR.glob("*.yml")):
|
||||
repo = cfg_path.stem
|
||||
with cfg_path.open() as fh:
|
||||
cfg = yaml.safe_load(fh) or {}
|
||||
rules = cfg.get("rules", {})
|
||||
rules.setdefault("branch", cfg.get("branch", "main"))
|
||||
if apply_protection(repo, rules):
|
||||
ok += 1
|
||||
|
||||
print(f"\nSynced {ok} repo(s)")
|
||||
|
||||
25
tests/test_night_shift_prediction_report.py
Normal file
25
tests/test_night_shift_prediction_report.py
Normal file
@@ -0,0 +1,25 @@
|
||||
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
|
||||
45
tests/test_sync_branch_protection.py
Normal file
45
tests/test_sync_branch_protection.py
Normal file
@@ -0,0 +1,45 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import importlib.util
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import yaml
|
||||
|
||||
PROJECT_ROOT = Path(__file__).parent.parent
|
||||
|
||||
_spec = importlib.util.spec_from_file_location(
|
||||
"sync_branch_protection_test",
|
||||
PROJECT_ROOT / "scripts" / "sync_branch_protection.py",
|
||||
)
|
||||
_mod = importlib.util.module_from_spec(_spec)
|
||||
sys.modules["sync_branch_protection_test"] = _mod
|
||||
_spec.loader.exec_module(_mod)
|
||||
|
||||
build_branch_protection_payload = _mod.build_branch_protection_payload
|
||||
|
||||
|
||||
def test_build_branch_protection_payload_enables_rebase_before_merge():
|
||||
payload = build_branch_protection_payload(
|
||||
"main",
|
||||
{
|
||||
"required_approvals": 1,
|
||||
"dismiss_stale_approvals": True,
|
||||
"require_ci_to_merge": False,
|
||||
"block_deletions": True,
|
||||
"block_force_push": True,
|
||||
"block_on_outdated_branch": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert payload["branch_name"] == "main"
|
||||
assert payload["rule_name"] == "main"
|
||||
assert payload["block_on_outdated_branch"] is True
|
||||
assert payload["required_approvals"] == 1
|
||||
assert payload["enable_status_check"] is False
|
||||
|
||||
|
||||
def test_the_nexus_branch_protection_config_requires_up_to_date_branch():
|
||||
config = yaml.safe_load((PROJECT_ROOT / ".gitea" / "branch-protection" / "the-nexus.yml").read_text())
|
||||
rules = config["rules"]
|
||||
assert rules["block_on_outdated_branch"] is True
|
||||
Reference in New Issue
Block a user