Compare commits
1 Commits
fix/1118
...
burn/1500-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b9672d82b |
89
docs/duplicate-pr-prevention.md
Normal file
89
docs/duplicate-pr-prevention.md
Normal file
@@ -0,0 +1,89 @@
|
||||
# Duplicate PR Prevention System
|
||||
|
||||
## Overview
|
||||
|
||||
The Nexus uses a multi-layer system to prevent duplicate PRs for the same issue.
|
||||
|
||||
## Components
|
||||
|
||||
### 1. Pre-flight Check (CI)
|
||||
|
||||
The `.github/workflows/pr-duplicate-check.yml` workflow runs on every PR creation and checks if a PR already exists for the same issue.
|
||||
|
||||
**How it works:**
|
||||
1. Extracts issue numbers from PR title and body
|
||||
2. Queries Gitea API for existing PRs referencing those issues
|
||||
3. Fails the check if duplicates are found
|
||||
4. Provides links to existing PRs for review
|
||||
|
||||
### 2. Cleanup Script
|
||||
|
||||
The `scripts/cleanup-duplicate-prs.sh` script helps clean up existing duplicates:
|
||||
- Lists all PRs for a given issue
|
||||
- Identifies duplicates
|
||||
- Provides commands to close duplicates
|
||||
|
||||
### 3. Milestone Checker
|
||||
|
||||
The `bin/check_duplicate_milestones.py` script prevents duplicate milestones:
|
||||
- Scans all milestones in the repo
|
||||
- Identifies duplicates by title
|
||||
- Reports for manual cleanup
|
||||
|
||||
## Usage
|
||||
|
||||
### Check for Duplicates Before Creating PR
|
||||
|
||||
```bash
|
||||
# Check if issue already has PRs
|
||||
curl -s -H "Authorization: token $GITEA_TOKEN" \
|
||||
"https://forge.alexanderwhitestone.com/api/v1/repos/Timmy_Foundation/the-nexus/pulls?state=open" \
|
||||
| jq '.[] | select(.body | contains("#ISSUE_NUMBER"))'
|
||||
```
|
||||
|
||||
### Clean Up Existing Duplicates
|
||||
|
||||
```bash
|
||||
# List PRs for issue
|
||||
./scripts/cleanup-duplicate-prs.sh --issue 1128
|
||||
|
||||
# Close duplicates (keep newest)
|
||||
./scripts/cleanup-duplicate-prs.sh --issue 1128 --close-duplicates
|
||||
```
|
||||
|
||||
## Example: Issue #1500
|
||||
|
||||
Issue #1500 documented that the pre-flight check successfully prevented a duplicate PR for #1474.
|
||||
|
||||
**What happened:**
|
||||
1. Dispatch attempted to work on #1474
|
||||
2. Pre-flight check found 2 existing PRs (#1495, #1493)
|
||||
3. System prevented creating a 3rd duplicate
|
||||
4. Issue #1500 was filed as an observation
|
||||
|
||||
**Result:** The system worked as intended.
|
||||
|
||||
## Best Practices
|
||||
|
||||
1. **Always check before creating PRs** — use the pre-flight check
|
||||
2. **Close duplicates promptly** — don't let them accumulate
|
||||
3. **Reference issues in PRs** — makes duplicate detection possible
|
||||
4. **Use descriptive branch names** — helps identify purpose
|
||||
5. **Review existing PRs first** — don't assume you're the first
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "Duplicate PR detected" error
|
||||
|
||||
This means a PR already exists for the issue. Options:
|
||||
1. Review the existing PR and contribute to it
|
||||
2. Close your PR if it's truly a duplicate
|
||||
3. Update your PR to address a different aspect
|
||||
|
||||
### Pre-flight check not running
|
||||
|
||||
Check that `.github/workflows/pr-duplicate-check.yml` exists and is enabled.
|
||||
|
||||
### False positives
|
||||
|
||||
The check looks for issue numbers in PR body. If you're referencing an issue without intending to fix it, use "Refs #" instead of "Fixes #".
|
||||
@@ -1,72 +0,0 @@
|
||||
# Bezalel UltraPlan — 2026-04-07 18:53 UTC
|
||||
|
||||
**Mode:** Claw Code — inspect deep, plan hard, execute relentlessly. Zero idling tolerated.
|
||||
|
||||
---
|
||||
|
||||
## Situation Report
|
||||
|
||||
| Metric | Count |
|
||||
|--------|-------|
|
||||
| My open issues | 92 |
|
||||
| Unassigned open issues | 92 |
|
||||
| Active blockers | 3 |
|
||||
| Poka-yoke issues open | 0 |
|
||||
| CI status (the-nexus main) | `failure` (34862cf5) |
|
||||
| CI status (timmy-home main) | `no_status` (c8b0f2a8) |
|
||||
|
||||
---
|
||||
|
||||
## North Star (The One Thing)
|
||||
|
||||
**Issue #882:** [M6-P3] Resurrection Pool — health polling, dead-agent detection, auto-revive
|
||||
- URL: https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus/issues/882
|
||||
- Created: 2026-04-06T15:28:38Z
|
||||
- **Done condition:** _Move this issue to a measurable next state (PR opened, test passing, blocker cleared, or documented failure mode)._
|
||||
|
||||
---
|
||||
|
||||
## Today's Attack Plan
|
||||
|
||||
### 1. Unblock (First 90 Minutes)
|
||||
- [ ] Address the North Star issue directly. No meetings, no yak shaving.
|
||||
- [ ] If blocked on external input, escalate in Timmy Time with specific ask.
|
||||
|
||||
### 2. Burn Down (Next 2 Hours)
|
||||
- [ ] #1117 — [PROPOSAL] Conversation Artifacts System: Organized Alexander request/response rooms in MemPalace
|
||||
- [ ] #1116 — [SOVEREIGN DIRECTIVE] Every wizard must catalog Alexander's requests and responses as artifacts
|
||||
- [ ] #1115 — [MEMORY] MemPalace Status Report: 283 drawers indexed, zero-API semantic memory active
|
||||
|
||||
### 3. Harden (Next 90 Minutes)
|
||||
- [ ] Advance one poka-yoke issue toward a structural prevention.
|
||||
- [ ] Run a security/reliability scan (world-readable secrets, stale heartbeats, dead runners).
|
||||
|
||||
### 4. Report (End of Day)
|
||||
- [ ] Update this issue with what moved, what blocked, and tomorrow's North Star.
|
||||
- [ ] Ensure all closed work has a clear paper trail (commit, comment, or closure note).
|
||||
|
||||
---
|
||||
|
||||
## Blockers Requiring Eyes
|
||||
|
||||
- **#882** — [M6-P3] Resurrection Pool — health polling, dead-agent detection, auto-revive → https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus/issues/882
|
||||
- **#707** — [RELIABILITY] Eliminate visible 404 and dead-control states in production Nexus → https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus/issues/707
|
||||
- **#694** — [HARNESS] Replace dead `/api/world/ws` path with a real Hermes world-state bridge → https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus/issues/694
|
||||
|
||||
---
|
||||
|
||||
## Poka-Yoke Backlog (Mistake-Proofing Queue)
|
||||
|
||||
- No poka-yoke issues found.
|
||||
|
||||
---
|
||||
|
||||
## Anti-Idling Protocol
|
||||
|
||||
If the North Star is blocked and no burn-down items are actionable within 15 minutes:
|
||||
1. Check Night Watch logs for anything stale.
|
||||
2. Pick the oldest unassigned issue in the-nexus.
|
||||
3. If no issues exist, run `bezalel-forge-scan` and file findings.
|
||||
4. If still nothing, document infrastructure state and commit to reports repo.
|
||||
|
||||
**Clock is ticking. Forge on.** 🔥
|
||||
@@ -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,26 +0,0 @@
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
REPORT = Path("reports/bezalel/2026-04-07-daily-forge-plan.md")
|
||||
|
||||
|
||||
def test_daily_forge_plan_report_exists_with_required_sections():
|
||||
assert REPORT.exists(), "expected daily forge plan report to exist"
|
||||
content = REPORT.read_text()
|
||||
assert "# Bezalel UltraPlan — 2026-04-07 18:53 UTC" in content
|
||||
assert "## Situation Report" in content
|
||||
assert "## North Star (The One Thing)" in content
|
||||
assert "## Today's Attack Plan" in content
|
||||
assert "## Blockers Requiring Eyes" in content
|
||||
assert "## Poka-Yoke Backlog (Mistake-Proofing Queue)" in content
|
||||
assert "## Anti-Idling Protocol" in content
|
||||
|
||||
|
||||
def test_daily_forge_plan_preserves_core_targets_and_metrics():
|
||||
content = REPORT.read_text()
|
||||
assert "| My open issues | 92 |" in content
|
||||
assert "| Unassigned open issues | 92 |" in content
|
||||
assert "**Issue #882:** [M6-P3] Resurrection Pool — health polling, dead-agent detection, auto-revive" in content
|
||||
assert "#1117 — [PROPOSAL] Conversation Artifacts System" in content
|
||||
assert "#1116 — [SOVEREIGN DIRECTIVE] Every wizard must catalog Alexander's requests and responses as artifacts" in content
|
||||
assert "#1115 — [MEMORY] MemPalace Status Report: 283 drawers indexed, zero-API semantic memory active" in content
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user