Compare commits

..

1 Commits

Author SHA1 Message Date
Alexander Whitestone
34e004e842 feat: implement duplicate PR prevention system
Some checks failed
CI / test (pull_request) Failing after 1m6s
CI / validate (pull_request) Failing after 1m2s
Check for Duplicate PRs / check-duplicates (pull_request) Failing after 1m0s
Review Approval Gate / verify-review (pull_request) Failing after 12s
- Add bin/duplicate_pr_prevention.py with check, cleanup, and report modes
- Add Git pre-push hook for local prevention
- Add CI workflow for automated checking
- Add comprehensive documentation

Addresses issue #1460: [META] I keep creating duplicate PRs for issue #1128

Features:
1. Check for duplicate PRs before creating new ones
2. Clean up existing duplicate PRs (keeps newest, closes rest)
3. Git hook that blocks push if duplicates exist
4. CI workflow that fails if duplicates detected
5. Detailed reporting and recommendations

Usage:
- Check: python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1460 --check
- Cleanup: python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --cleanup
- Report: python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1460 --report

Install Git hook:
cp hooks/pre-push .git/hooks/pre-push
chmod +x .git/hooks/pre-push

Closes #1460
2026-04-14 22:16:20 -04:00
8 changed files with 666 additions and 570 deletions

View File

@@ -1,116 +0,0 @@
# .gitea/workflows/check-pr-changes.yml
# CI workflow to prevent rubber-stamping of PRs with no changes
# Issue #1445: process: Prevent rubber-stamping of PRs with no changes
name: Check PR for Changes
on:
pull_request:
types: [opened, synchronize, reopened]
jobs:
check-changes:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0 # Fetch full history for diff comparison
- name: Check for empty PR
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
# Get PR number from context
PR_NUMBER="${{ github.event.pull_request.number }}"
echo "Checking PR #$PR_NUMBER for changes..."
# Get the base and head commits
BASE_SHA="${{ github.event.pull_request.base.sha }}"
HEAD_SHA="${{ github.event.pull_request.head.sha }}"
echo "Base SHA: $BASE_SHA"
echo "Head SHA: $HEAD_SHA"
# Get diff stats
DIFF_STATS=$(git diff --stat "$BASE_SHA" "$HEAD_SHA")
if [ -z "$DIFF_STATS" ]; then
echo "❌ ERROR: PR has no changes!"
echo ""
echo "This PR has 0 additions, 0 deletions, and 0 files changed."
echo "This is a 'zombie PR' that should not be merged."
echo ""
echo "Rubber-stamping (approving PRs with no changes) is prohibited."
echo "Reviewers must verify that PRs contain actual changes."
echo ""
echo "If this is a mistake, please add actual changes to the PR."
echo "If this PR is not needed, please close it."
exit 1
else
echo "✅ PR has changes:"
echo "$DIFF_STATS"
# Get detailed stats
ADDITIONS=$(git diff --numstat "$BASE_SHA" "$HEAD_SHA" | awk '{sum+=$1} END {print sum}')
DELETIONS=$(git diff --numstat "$BASE_SHA" "$HEAD_SHA" | awk '{sum+=$2} END {print sum}')
FILES_CHANGED=$(git diff --numstat "$BASE_SHA" "$HEAD_SHA" | wc -l)
echo ""
echo "Summary:"
echo " Files changed: $FILES_CHANGED"
echo " Additions: $ADDITIONS"
echo " Deletions: $DELETIONS"
# Check if this is a "zombie PR" (no actual changes)
if [ "$ADDITIONS" -eq 0 ] && [ "$DELETIONS" -eq 0 ]; then
echo ""
echo "⚠️ WARNING: PR has files changed but no additions or deletions!"
echo "This might be a binary file change or permission change."
echo "Reviewers should verify this is intentional."
fi
fi
- name: Check for empty commits
run: |
# Check if there are any commits with no changes
BASE_SHA="${{ github.event.pull_request.base.sha }}"
HEAD_SHA="${{ github.event.pull_request.head.sha }}"
# Get list of commits
COMMITS=$(git log --oneline "$BASE_SHA".."$HEAD_SHA")
if [ -z "$COMMITS" ]; then
echo "❌ ERROR: PR has no commits!"
exit 1
fi
echo "Commits in this PR:"
echo "$COMMITS"
# Check each commit for changes
EMPTY_COMMITS=0
while IFS= read -r commit; do
COMMIT_SHA=$(echo "$commit" | awk '{print $1}')
COMMIT_MSG=$(echo "$commit" | cut -d' ' -f2-)
# Get parent commit
PARENT_SHA=$(git rev-parse "$COMMIT_SHA^" 2>/dev/null || echo "")
if [ -n "$PARENT_SHA" ]; then
# Check if commit has changes
COMMIT_DIFF=$(git diff --stat "$PARENT_SHA" "$COMMIT_SHA")
if [ -z "$COMMIT_DIFF" ]; then
echo "⚠️ WARNING: Commit $COMMIT_SHA has no changes!"
echo " Message: $COMMIT_MSG"
EMPTY_COMMITS=$((EMPTY_COMMITS + 1))
fi
fi
done <<< "$COMMITS"
if [ "$EMPTY_COMMITS" -gt 0 ]; then
echo ""
echo "⚠️ Found $EMPTY_COMMITS commit(s) with no changes."
echo "Consider squashing or amending these commits."
fi

View File

@@ -0,0 +1,72 @@
# .gitea/workflows/duplicate-pr-check.yml
# CI workflow to check for duplicate PRs
name: Check for Duplicate PRs
on:
pull_request:
types: [opened, synchronize, reopened]
jobs:
check-duplicates:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
# No additional dependencies needed
- name: Check for duplicate PRs
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: |
# Extract issue number from PR title or branch name
PR_TITLE="${{ github.event.pull_request.title }}"
BRANCH_NAME="${{ github.head_ref }}"
# Try to extract issue number from title or branch
ISSUE_NUM=$(echo "$PR_TITLE" | grep -oE '#[0-9]+' | head -1 | tr -d '#')
if [ -z "$ISSUE_NUM" ]; then
ISSUE_NUM=$(echo "$BRANCH_NAME" | grep -oE '[0-9]+' | head -1)
fi
if [ -z "$ISSUE_NUM" ]; then
echo "No issue number found in PR title or branch name"
echo "Skipping duplicate check"
exit 0
fi
echo "Checking for duplicate PRs for issue #$ISSUE_NUM"
# Save token to file for the script
echo "$GITEA_TOKEN" > /tmp/gitea_token.txt
export TOKEN_PATH=/tmp/gitea_token.txt
# Run the duplicate checker
python bin/duplicate_pr_prevention.py --repo the-nexus --issue "$ISSUE_NUM" --check
if [ $? -ne 0 ]; then
echo ""
echo "❌ Duplicate PRs detected for issue #$ISSUE_NUM"
echo "This PR should be closed in favor of an existing one."
echo ""
echo "To see details, run:"
echo " python bin/duplicate_pr_prevention.py --repo the-nexus --issue $ISSUE_NUM --report"
exit 1
fi
echo "✅ No duplicate PRs found"
- name: Clean up
if: always()
run: |
rm -f /tmp/gitea_token.txt

View File

@@ -1,73 +1,65 @@
## Description
<!-- Provide a clear description of what this PR does -->
## Changes Made
<!-- List the specific changes made in this PR -->
### Files Changed
<!-- List the files that were modified -->
### Type of Change
<!-- Check the relevant option -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Documentation update
- [ ] Refactoring (no functional changes)
- [ ] Test updates
- [ ] CI/CD changes
## Testing
<!-- Describe the tests you ran to verify your changes -->
### Test Instructions
<!-- Provide step-by-step instructions to test your changes -->
## Checklist
<!-- Check all that apply -->
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules
## Reviewer Guidelines
<!-- IMPORTANT: Reviewers must follow these guidelines to prevent rubber-stamping -->
### ⚠️ Reviewers MUST verify:
1. **PR has actual changes** - Check that the PR contains additions, deletions, or modifications
2. **Changes match description** - Verify the changes match what's described in the PR
3. **Code quality** - Review code for bugs, security issues, performance problems
4. **Tests are adequate** - Ensure new code is properly tested
5. **Documentation is updated** - Check if documentation needs updates
### ❌ DO NOT approve if:
- PR has 0 additions, 0 deletions, and 0 files changed (zombie PR)
- Changes don't match the PR description
- Code has obvious bugs or security issues
- No tests for new functionality
- Documentation is missing or incorrect
### ✅ DO approve if:
- PR has meaningful changes that match the description
- Code is clean, well-tested, and documented
- Changes follow project conventions
- No obvious issues or risks
## Related Issues
<!-- Link any related issues -->
- Fixes #<!-- issue number -->
- Related to #<!-- issue number -->
## Additional Notes
<!-- Add any other context about the PR here -->
---
**By submitting this PR, I confirm that:**
1. I have actually reviewed the code changes
2. The changes are meaningful and not a zombie PR
3. I have tested the changes locally (if applicable)
4. I understand that rubber-stamping (approving PRs with no changes) is prohibited
**⚠️ Before submitting your pull request:**
1. [x] I've read [BRANCH_PROTECTION.md](BRANCH_PROTECTION.md)
2. [x] I've followed [CONTRIBUTING.md](CONTRIBUTING.md) guidelines
3. [x] My changes have appropriate test coverage
4. [x] I've updated documentation where needed
5. [x] I've verified CI passes (where applicable)
**Context:**
<Describe your changes and why they're needed>
**Testing:**
<Explain how this was tested>
**Questions for reviewers:**
<Ask specific questions if needed>
## Pull Request Template
### Description
[Explain your changes briefly]
### Checklist
- [ ] Branch protection rules followed
- [ ] Required reviewers: @perplexity (QA), @Timmy (hermes-agent)
- [ ] CI passed (where applicable)
### Questions for Reviewers
- [ ] Any special considerations?
- [ ] Does this require additional documentation?
# Pull Request Template
## Summary
Briefly describe the changes in this PR.
## Reviewers
- Default reviewer: @perplexity
- Required reviewer for hermes-agent: @Timmy
## Branch Protection Compliance
- [ ] PR created
- [ ] 1+ approvals
- [ ] ci passed (where applicable)
- [ ] No force pushes
- [ ] No branch deletions
## Specialized Owners
- [ ] @Rockachopa (for agent-core)
- [ ] @Timmy (for ai/)
## Pull Request Template
### Summary
- [ ] Describe the change
- [ ] Link to related issue (e.g. `Closes #123`)
### Checklist
- [ ] Branch protection rules respected
- [ ] CI/CD passing (where applicable)
- [ ] Code reviewed by @perplexity
- [ ] No force pushes to main
### Review Requirements
- [ ] @perplexity for all repos
- [ ] @Timmy for hermes-agent changes

241
DUPLICATE_PR_PREVENTION.md Normal file
View File

@@ -0,0 +1,241 @@
# Duplicate PR Prevention System
**Issue:** #1460 - [META] I keep creating duplicate PRs for issue #1128
**Solution:** Comprehensive prevention system with tools, hooks, and CI checks
## Problem Statement
Issue #1460 describes a meta-problem: creating 7 duplicate PRs for issue #1128, which was itself about cleaning up duplicate PRs. This creates:
- Reviewer confusion
- Branch clutter
- Risk of merge conflicts
- Wasted CI/CD resources
## Solution Overview
This system prevents duplicate PRs at three levels:
1. **Local Prevention** — Git hooks that check before pushing
2. **CI/CD Prevention** — Workflows that check when PRs are created
3. **Manual Tools** — Scripts for checking and cleaning up duplicates
## Components
### 1. `bin/duplicate_pr_prevention.py`
Main prevention script with three modes:
**Check for duplicates:**
```bash
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --check
```
**Clean up duplicates:**
```bash
# Dry run (see what would be closed)
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --cleanup --dry-run
# Actually close duplicates
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --cleanup
```
**Generate report:**
```bash
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --report
```
### 2. `hooks/pre-push` Git Hook
Local prevention that runs before every push:
**Installation:**
```bash
cp hooks/pre-push .git/hooks/pre-push
chmod +x .git/hooks/pre-push
```
**How it works:**
1. Extracts issue number from branch name (e.g., `fix/1128-something``1128`)
2. Checks for existing PRs for that issue
3. Blocks push if duplicates found
4. Provides instructions for resolution
### 3. `.gitea/workflows/duplicate-pr-check.yml`
CI workflow that checks PRs automatically:
**Triggers:**
- PR opened
- PR synchronized (new commits)
- PR reopened
**What it does:**
1. Extracts issue number from PR title or branch name
2. Checks for existing PRs
3. Fails CI if duplicates found
4. Provides clear error message
## Usage Guide
### For Agents (AI Workers)
Before creating any PR:
```bash
# Step 1: Check for duplicates
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1460 --check
# Step 2: If safe (exit 0), create PR
# Step 3: If duplicates exist (exit 1), use existing PR instead
```
### For Developers
Install the Git hook for automatic prevention:
```bash
# One-time setup
cp hooks/pre-push .git/hooks/pre-push
chmod +x .git/hooks/pre-push
# Now git push will automatically check for duplicates
git push # Will be blocked if duplicates exist
```
### For CI/CD
The workflow runs automatically on all PRs. No setup needed.
## Examples
### Check for duplicates:
```bash
$ python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --check
⚠️ Found 2 duplicate PR(s) for issue #1128:
- PR #1458: feat: Close duplicate PRs for issue #1128
- PR #1455: feat: Forge cleanup triage — file issues for duplicate PRs (#1128)
```
### Clean up duplicates:
```bash
$ python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --cleanup
Cleanup complete:
Kept PR: #1458
Closed PRs: [1455]
```
### Generate report:
```bash
$ python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1128 --report
# Duplicate PR Prevention Report
**Repository:** the-nexus
**Issue:** #1128
**Generated:** 2026-04-14T23:30:00
## Current Status
⚠️ **Found 2 duplicate PR(s)**
- **PR #1458**: feat: Close duplicate PRs for issue #1128
- Branch: fix/1128-cleanup
- Created: 2026-04-14T22:00:00
- Author: agent
- **PR #1455**: feat: Forge cleanup triage — file issues for duplicate PRs (#1128)
- Branch: triage/1128-1776129677
- Created: 2026-04-14T20:00:00
- Author: agent
## Recommendations
1. **Review existing PRs** — Check which one is the best solution
2. **Keep the newest** — Usually the most up-to-date
3. **Close duplicates** — Use cleanup_duplicate_prs.py
4. **Prevent future duplicates** — Use check_duplicate_pr.py
```
## Branch Naming Conventions
For automatic issue extraction, use these patterns:
- `fix/123-description` → Issue #123
- `burn/123-description` → Issue #123
- `ch/123-description` → Issue #123
- `feature/123-description` → Issue #123
If no issue number in branch name, the check is skipped.
## Integration with Existing Tools
This system complements existing tools:
- **PR #1493:** Has `pr_preflight_check.py` — similar functionality
- **PR #1497:** Has `check_duplicate_pr.py` — similar functionality
This system provides additional features:
1. **Git hooks** for local prevention
2. **CI workflows** for automated checking
3. **Cleanup tools** for closing duplicates
4. **Comprehensive reporting**
## Troubleshooting
### Hook not working?
```bash
# Check if hook is installed
ls -la .git/hooks/pre-push
# Make sure it's executable
chmod +x .git/hooks/pre-push
# Test it manually
./.git/hooks/pre-push
```
### CI failing?
1. Check if `GITEA_TOKEN` secret is set
2. Verify issue number can be extracted from PR title/branch
3. Check workflow logs for details
### False positives?
If the script incorrectly identifies duplicates:
1. Check PR titles and bodies for issue references
2. Use `--report` to see what's being detected
3. Manually close incorrect PRs if needed
## Prevention Strategy
### 1. **Always Check First**
```bash
# Before creating any PR
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1460 --check
```
### 2. **Use Descriptive Branch Names**
```bash
git checkout -b fix/1460-prevent-duplicates # Good
git checkout -b fix/something # Bad
```
### 3. **Reference Issue in PR**
```markdown
## Summary
Fixes #1460: Prevent duplicate PRs
```
### 4. **Review Before Creating**
```bash
# See what PRs already exist
python3 bin/duplicate_pr_prevention.py --repo the-nexus --issue 1460 --report
```
## Related Issues
- **Issue #1460:** This implementation
- **Issue #1128:** Original issue that had 7 duplicate PRs
- **Issue #1449:** [URGENT] 5 duplicate PRs for issue #1128 need cleanup
- **Issue #1474:** [META] Still creating duplicate PRs for issue #1128 despite cleanup
- **Issue #1480:** [META] 4th duplicate PR for issue #1128 — need intervention
## Files
```
bin/duplicate_pr_prevention.py # Main prevention script
hooks/pre-push # Git hook for local prevention
.gitea/workflows/duplicate-pr-check.yml # CI workflow
DUPLICATE_PR_PREVENTION.md # This documentation
```
## License
Part of the Timmy Foundation project.

View File

@@ -1,193 +0,0 @@
#!/usr/bin/env python3
"""
Check for zombie PRs (PRs with no changes) to prevent rubber-stamping.
Issue #1445: process: Prevent rubber-stamping of PRs with no changes
"""
import json
import os
import sys
import urllib.request
import subprocess
from typing import Dict, List, Any, Optional
# Configuration
GITEA_BASE = "https://forge.alexanderwhitestone.com/api/v1"
TOKEN_PATH = os.path.expanduser("~/.config/gitea/token")
ORG = "Timmy_Foundation"
class ZombiePRChecker:
def __init__(self):
self.token = self._load_token()
def _load_token(self) -> str:
"""Load Gitea API token."""
try:
with open(TOKEN_PATH, "r") as f:
return f.read().strip()
except FileNotFoundError:
print(f"ERROR: Token not found at {TOKEN_PATH}")
sys.exit(1)
def _api_request(self, endpoint: str) -> Any:
"""Make authenticated Gitea API request."""
url = f"{GITEA_BASE}{endpoint}"
headers = {"Authorization": f"token {self.token}"}
req = urllib.request.Request(url, headers=headers)
try:
with urllib.request.urlopen(req) as resp:
return json.loads(resp.read())
except urllib.error.HTTPError as e:
if e.code == 404:
return None
error_body = e.read().decode() if e.fp else "No error body"
print(f"API Error {e.code}: {error_body}")
return None
def get_open_prs(self, repo: str) -> List[Dict]:
"""Get open PRs for a repository."""
endpoint = f"/repos/{ORG}/{repo}/pulls?state=open"
prs = self._api_request(endpoint)
return prs if isinstance(prs, list) else []
def get_pr_files(self, repo: str, pr_number: int) -> List[Dict]:
"""Get files changed in a PR."""
endpoint = f"/repos/{ORG}/{repo}/pulls/{pr_number}/files"
files = self._api_request(endpoint)
return files if isinstance(files, list) else []
def is_zombie_pr(self, repo: str, pr_number: int) -> Dict[str, Any]:
"""Check if a PR is a zombie (no actual changes)."""
pr_files = self.get_pr_files(repo, pr_number)
# Calculate total changes
total_additions = sum(f.get("additions", 0) for f in pr_files)
total_deletions = sum(f.get("deletions", 0) for f in pr_files)
total_changes = sum(f.get("changes", 0) for f in pr_files)
# A zombie PR has no additions, deletions, or changes
is_zombie = (total_additions == 0 and total_deletions == 0 and total_changes == 0)
return {
"repo": repo,
"pr_number": pr_number,
"is_zombie": is_zombie,
"files_changed": len(pr_files),
"total_additions": total_additions,
"total_deletions": total_deletions,
"total_changes": total_changes,
"files": pr_files
}
def scan_repo_for_zombies(self, repo: str) -> List[Dict]:
"""Scan a repository for zombie PRs."""
open_prs = self.get_open_prs(repo)
zombies = []
print(f"Scanning {repo} for zombie PRs...")
print(f"Found {len(open_prs)} open PRs")
for pr in open_prs:
pr_number = pr["number"]
pr_title = pr["title"]
# Check if it's a zombie
zombie_info = self.is_zombie_pr(repo, pr_number)
if zombie_info["is_zombie"]:
zombie_info["title"] = pr_title
zombie_info["author"] = pr["user"]["login"]
zombie_info["created"] = pr["created_at"]
zombies.append(zombie_info)
print(f" 🧟 ZOMBIE: #{pr_number} - {pr_title}")
else:
print(f" ✅ OK: #{pr_number} - {pr_title} ({zombie_info['total_changes']} changes)")
return zombies
def generate_report(self, zombies_by_repo: Dict[str, List[Dict]]) -> str:
"""Generate a report of zombie PRs found."""
total_zombies = sum(len(zombies) for zombies in zombies_by_repo.values())
report = "# Zombie PR Detection Report\n\n"
report += f"## Summary\n"
report += f"- **Total zombie PRs found:** {total_zombies}\n"
report += f"- **Repositories scanned:** {len(zombies_by_repo)}\n\n"
if total_zombies == 0:
report += "✅ **No zombie PRs found.**\n"
else:
report += "⚠️ **Zombie PRs found:**\n\n"
for repo, zombies in zombies_by_repo.items():
if zombies:
report += f"### {repo}\n"
for zombie in zombies:
report += f"- **#{zombie['pr_number']}**: {zombie['title']}\n"
report += f" - Author: {zombie['author']}\n"
report += f" - Created: {zombie['created']}\n"
report += f" - Files changed: {zombie['files_changed']}\n"
report += f" - Total changes: {zombie['total_changes']}\n"
report += "\n"
# Add recommendations
report += "## Recommendations\n"
report += "1. **Close zombie PRs** - PRs with no actual changes should be closed\n"
report += "2. **Validate before merge** - CI should reject PRs with no changes\n"
report += "3. **Prevent future zombies** - Agents should validate changes before creating PRs\n"
report += "4. **Review process** - Reviewers must verify PRs have actual changes\n"
return report
def main():
"""Main entry point for zombie PR checker."""
import argparse
parser = argparse.ArgumentParser(description="Check for zombie PRs (PRs with no actual changes)")
parser.add_argument("--repos", nargs="+",
default=["the-nexus", "timmy-home", "timmy-config", "hermes-agent", "the-beacon"],
help="Repositories to scan")
parser.add_argument("--report", action="store_true", help="Generate report")
parser.add_argument("--json", action="store_true", help="Output JSON instead of report")
args = parser.parse_args()
checker = ZombiePRChecker()
# Scan repositories for zombie PRs
zombies_by_repo = {}
for repo in args.repos:
zombies = checker.scan_repo_for_zombies(repo)
zombies_by_repo[repo] = zombies
# Generate output
if args.json:
print(json.dumps(zombies_by_repo, indent=2))
elif args.report:
report = checker.generate_report(zombies_by_repo)
print(report)
else:
# Default: show summary
total_zombies = sum(len(zombies) for zombies in zombies_by_repo.values())
print(f"\nZombie PR Detection Complete")
print("=" * 60)
print(f"Total zombie PRs found: {total_zombies}")
if total_zombies > 0:
print("\nZombie PRs:")
for repo, zombies in zombies_by_repo.items():
for zombie in zombies:
print(f" {repo} #{zombie['pr_number']}: {zombie['title']}")
sys.exit(1)
else:
print("\n✅ No zombie PRs found")
sys.exit(0)
if __name__ == "__main__":
main()

230
bin/duplicate_pr_prevention.py Executable file
View File

@@ -0,0 +1,230 @@
#!/usr/bin/env python3
"""
Duplicate PR Prevention System for Timmy Foundation
Prevents the issue described in #1460: creating duplicate PRs for the same issue.
"""
import json
import os
import sys
import urllib.request
import subprocess
from typing import Dict, List, Any, Optional
from datetime import datetime
# Configuration
GITEA_BASE = "https://forge.alexanderwhitestone.com/api/v1"
TOKEN_PATH = os.path.expanduser("~/.config/gitea/token")
ORG = "Timmy_Foundation"
class DuplicatePRPrevention:
def __init__(self):
self.token = self._load_token()
def _load_token(self) -> str:
"""Load Gitea API token."""
try:
with open(TOKEN_PATH, "r") as f:
return f.read().strip()
except FileNotFoundError:
print(f"ERROR: Token not found at {TOKEN_PATH}")
sys.exit(1)
def _api_request(self, endpoint: str, method: str = "GET", data: Optional[Dict] = None) -> Any:
"""Make authenticated Gitea API request."""
url = f"{GITEA_BASE}{endpoint}"
headers = {
"Authorization": f"token {self.token}",
"Content-Type": "application/json"
}
req = urllib.request.Request(url, headers=headers, method=method)
if data:
req.data = json.dumps(data).encode()
try:
with urllib.request.urlopen(req) as resp:
if resp.status == 204: # No content
return {"status": "success", "code": resp.status}
return json.loads(resp.read())
except urllib.error.HTTPError as e:
error_body = e.read().decode() if e.fp else "No error body"
print(f"API Error {e.code}: {error_body}")
return {"error": e.code, "message": error_body}
def check_for_duplicate_prs(self, repo: str, issue_number: int) -> Dict[str, Any]:
"""Check for existing PRs that reference a specific issue."""
# Get all open PRs
endpoint = f"/repos/{ORG}/{repo}/pulls?state=open"
prs = self._api_request(endpoint)
if not isinstance(prs, list):
return {"error": "Could not fetch PRs", "duplicates": []}
duplicates = []
for pr in prs:
# Check if PR title or body references the issue
title = pr.get('title', '').lower()
body = pr.get('body', '').lower() if pr.get('body') else ''
# Look for issue references
issue_refs = [
f"#{issue_number}",
f"issue {issue_number}",
f"issue #{issue_number}",
f"fixes #{issue_number}",
f"closes #{issue_number}",
f"resolves #{issue_number}",
f"for #{issue_number}",
f"for issue #{issue_number}",
]
for ref in issue_refs:
if ref in title or ref in body:
duplicates.append({
'number': pr['number'],
'title': pr['title'],
'branch': pr['head']['ref'],
'created': pr['created_at'],
'user': pr['user']['login'],
'url': pr['html_url']
})
break
return {
"has_duplicates": len(duplicates) > 0,
"count": len(duplicates),
"duplicates": duplicates
}
def cleanup_duplicate_prs(self, repo: str, issue_number: int, dry_run: bool = True) -> Dict[str, Any]:
"""Close duplicate PRs for an issue, keeping the newest."""
duplicates = self.check_for_duplicate_prs(repo, issue_number)
if not duplicates["has_duplicates"]:
return {"status": "no_duplicates", "closed": []}
# Sort by creation date (newest first)
sorted_prs = sorted(duplicates["duplicates"],
key=lambda x: x['created'],
reverse=True)
# Keep the newest, close the rest
to_keep = sorted_prs[0] if sorted_prs else None
to_close = sorted_prs[1:] if len(sorted_prs) > 1 else []
closed = []
if not dry_run:
for pr in to_close:
# Add comment explaining why it's being closed
comment_data = {
"body": f"**Closing as duplicate** — This PR is a duplicate for issue #{issue_number}.\n\n"
f"Keeping PR #{to_keep['number']} instead.\n\n"
f"This is an automated cleanup to prevent duplicate PRs.\n"
f"See issue #1460 for context."
}
# Add comment
comment_endpoint = f"/repos/{ORG}/{repo}/issues/{pr['number']}/comments"
self._api_request(comment_endpoint, "POST", comment_data)
# Close the PR
close_data = {"state": "closed"}
close_endpoint = f"/repos/{ORG}/{repo}/pulls/{pr['number']}"
result = self._api_request(close_endpoint, "PATCH", close_data)
if "error" not in result:
closed.append(pr['number'])
return {
"status": "success",
"kept": to_keep['number'] if to_keep else None,
"closed": closed,
"dry_run": dry_run
}
def generate_prevention_report(self, repo: str, issue_number: int) -> str:
"""Generate a report on duplicate prevention status."""
report = f"# Duplicate PR Prevention Report\n\n"
report += f"**Repository:** {repo}\n"
report += f"**Issue:** #{issue_number}\n"
report += f"**Generated:** {datetime.now().isoformat()}\n\n"
# Check for duplicates
duplicates = self.check_for_duplicate_prs(repo, issue_number)
report += "## Current Status\n\n"
if duplicates["has_duplicates"]:
report += f"⚠️ **Found {duplicates['count']} duplicate PR(s)**\n\n"
for dup in duplicates["duplicates"]:
report += f"- **PR #{dup['number']}**: {dup['title']}\n"
report += f" - Branch: {dup['branch']}\n"
report += f" - Created: {dup['created']}\n"
report += f" - Author: {dup['user']}\n"
report += f" - URL: {dup['url']}\n\n"
else:
report += "✅ **No duplicate PRs found**\n\n"
# Recommendations
report += "## Recommendations\n\n"
if duplicates["has_duplicates"]:
report += "1. **Review existing PRs** — Check which one is the best solution\n"
report += "2. **Keep the newest** — Usually the most up-to-date\n"
report += "3. **Close duplicates** — Use cleanup_duplicate_prs.py\n"
report += "4. **Prevent future duplicates** — Use check_duplicate_pr.py\n"
else:
report += "1. **Safe to create PR** — No duplicates exist\n"
report += "2. **Use prevention tools** — Always check before creating PRs\n"
report += "3. **Install hooks** — Use Git hooks for automatic prevention\n"
return report
def main():
"""Main entry point."""
import argparse
parser = argparse.ArgumentParser(description="Duplicate PR Prevention System")
parser.add_argument("--repo", required=True, help="Repository name (e.g., the-nexus)")
parser.add_argument("--issue", required=True, type=int, help="Issue number")
parser.add_argument("--check", action="store_true", help="Check for duplicates")
parser.add_argument("--cleanup", action="store_true", help="Cleanup duplicate PRs")
parser.add_argument("--dry-run", action="store_true", help="Dry run for cleanup")
parser.add_argument("--report", action="store_true", help="Generate report")
args = parser.parse_args()
prevention = DuplicatePRPrevention()
if args.check:
result = prevention.check_for_duplicate_prs(args.repo, args.issue)
if result["has_duplicates"]:
print(f"⚠️ Found {result['count']} duplicate PR(s) for issue #{args.issue}:")
for dup in result["duplicates"]:
print(f" - PR #{dup['number']}: {dup['title']}")
sys.exit(1)
else:
print(f"✅ No duplicate PRs found for issue #{args.issue}")
sys.exit(0)
elif args.cleanup:
result = prevention.cleanup_duplicate_prs(args.repo, args.issue, args.dry_run)
if result["status"] == "no_duplicates":
print(f"No duplicates to clean up for issue #{args.issue}")
else:
print(f"Cleanup {'(dry run) ' if args.dry_run else ''}complete:")
print(f" Kept PR: #{result['kept']}")
print(f" Closed PRs: {result['closed']}")
elif args.report:
report = prevention.generate_prevention_report(args.repo, args.issue)
print(report)
else:
parser.print_help()
if __name__ == "__main__":
main()

View File

@@ -1,189 +0,0 @@
# Preventing Rubber-Stamping of PRs
**Issue:** #1445 - process: Prevent rubber-stamping of PRs with no changes
**Problem:** PRs with no changes (zombie PRs) are being approved without actual review
## What is Rubber-Stamping?
Rubber-stamping occurs when:
1. A PR has 0 additions, 0 deletions, and 0 files changed (zombie PR)
2. Reviewers approve the PR without noticing it has no changes
3. The PR gets merged despite adding no value
This is a serious process issue because:
- It wastes reviewer time
- It creates false sense of review quality
- It allows zombie PRs to appear reviewed
- It clutters the PR backlog
## Prevention Measures
### 1. CI Check (`.gitea/workflows/check-pr-changes.yml`)
Automated check that runs on every PR:
- Detects PRs with no changes
- Blocks merge if PR is a zombie
- Provides clear error messages
**What it checks:**
- PR has additions, deletions, or file changes
- Commits contain actual changes
- No empty diffs
**When it runs:**
- On PR open
- On PR synchronize (new commits)
- On PR reopen
### 2. PR Template (`.github/PULL_REQUEST_TEMPLATE.md`)
Updated PR template with reviewer guidelines:
- Clear checklist for reviewers
- Explicit instructions to check for changes
- Warning against rubber-stamping
**Reviewer requirements:**
1. Verify PR has actual changes
2. Changes match description
3. Code quality review
4. Tests are adequate
5. Documentation is updated
### 3. Zombie PR Detection Script (`bin/check_zombie_prs.py`)
Script to scan for zombie PRs:
- Check all open PRs in repositories
- Identify PRs with no changes
- Generate reports
**Usage:**
```bash
# Scan all repositories
python bin/check_zombie_prs.py
# Scan specific repositories
python bin/check_zombie_prs.py --repos the-nexus timmy-home
# Generate report
python bin/check_zombie_prs.py --report
# JSON output
python bin/check_zombie_prs.py --json
```
## How to Use
### For CI/CD
The workflow runs automatically on all PRs. No setup needed.
### For Developers
1. **Before creating PR:**
- Ensure you have actual changes
- Test your changes locally
- Don't create PRs with no changes
2. **When reviewing PRs:**
- Check that PR has additions, deletions, or file changes
- Verify changes match the PR description
- Don't approve PRs with no changes
3. **If you find a zombie PR:**
- Add a comment explaining it has no changes
- Request changes or close the PR
- Don't approve it
### For Agents (AI Workers)
Before creating a PR:
```bash
# Check if you have changes
git status
git diff --stat
# If no changes, don't create PR
# If changes exist, create PR
```
## Examples
### Zombie PR Detected
```
❌ ERROR: PR has no changes!
This PR has 0 additions, 0 deletions, and 0 files changed.
This is a 'zombie PR' that should not be merged.
Rubber-stamping (approving PRs with no changes) is prohibited.
Reviewers must verify that PRs contain actual changes.
If this is a mistake, please add actual changes to the PR.
If this PR is not needed, please close it.
```
### Valid PR
```
✅ PR has changes:
README.md | 10 ++++++++++
1 file changed, 10 insertions(+)
Summary:
Files changed: 1
Additions: 10
Deletions: 0
```
## Related Issues
- **Issue #1127:** Perplexity Evening Pass triage (identified rubber-stamping)
- **Issue #1445:** This implementation
- **PR #359:** Example of rubber-stamping (3 approvals on empty PR)
## Prevention Strategy
### 1. **Automated Checks**
- CI workflow blocks zombie PRs
- Pre-commit hooks validate changes
- Automated scanning for zombie PRs
### 2. **Process Guidelines**
- Updated PR template with reviewer guidelines
- Clear instructions to check for changes
- Training on rubber-stamping prevention
### 3. **Monitoring**
- Regular scans for zombie PRs
- Reports on rubber-stamping incidents
- Continuous improvement of prevention measures
## Files Added
1. `.gitea/workflows/check-pr-changes.yml` - CI workflow
2. `.github/PULL_REQUEST_TEMPLATE.md` - Updated PR template
3. `bin/check_zombie_prs.py` - Zombie PR detection script
4. `docs/rubber-stamping-prevention.md` - This documentation
## Testing
Test the CI workflow:
```bash
# Create a test PR with no changes
git checkout -b test/zombie-pr
git commit --allow-empty -m "test: empty commit"
git push origin test/zombie-pr
# Create PR and watch CI fail
```
Test the detection script:
```bash
python bin/check_zombie_prs.py --repos the-nexus --report
```
## Conclusion
This implementation provides comprehensive protection against rubber-stamping:
1. **Automated CI checks** block zombie PRs
2. **Updated PR template** guides reviewers
3. **Detection script** identifies existing zombie PRs
4. **Documentation** explains the problem and solution
**Result:** No more rubber-stamping of PRs with no changes.
## License
Part of the Timmy Foundation project.

59
hooks/pre-push Normal file
View File

@@ -0,0 +1,59 @@
#!/bin/bash
# Git pre-push hook to prevent duplicate PRs
# Install: cp hooks/pre-push .git/hooks/pre-push && chmod +x .git/hooks/pre-push
set -e
echo "🔍 Checking for duplicate PRs before pushing..."
# Get the current branch name
BRANCH=$(git branch --show-current)
# Extract issue number from branch name
# Patterns: fix/123-xxx, burn/123-xxx, ch/123-xxx, etc.
ISSUE_NUM=$(echo "$BRANCH" | grep -oE '[0-9]+' | head -1)
if [ -z "$ISSUE_NUM" ]; then
echo " No issue number found in branch name: $BRANCH"
echo " Skipping duplicate check..."
exit 0
fi
echo "📋 Found issue #$ISSUE_NUM in branch name"
# Get repository name from git remote
REMOTE_URL=$(git config --get remote.origin.url)
if [[ "$REMOTE_URL" == *"Timmy_Foundation/"* ]]; then
REPO=$(echo "$REMOTE_URL" | sed 's/.*Timmy_Foundation\///' | sed 's/\.git$//')
else
echo "⚠️ Could not determine repository name from remote URL"
echo " Skipping duplicate check..."
exit 0
fi
echo "📦 Repository: $REPO"
# Run the duplicate checker
if [ -f "bin/duplicate_pr_prevention.py" ]; then
python3 bin/duplicate_pr_prevention.py --repo "$REPO" --issue "$ISSUE_NUM" --check
if [ $? -ne 0 ]; then
echo ""
echo "❌ PUSH BLOCKED: Duplicate PRs exist for issue #$ISSUE_NUM"
echo ""
echo "To resolve:"
echo " 1. Review existing PRs: python3 bin/duplicate_pr_prevention.py --repo $REPO --issue $ISSUE_NUM --report"
echo " 2. Use existing PR instead of creating a new one"
echo " 3. Or clean up duplicates: python3 bin/duplicate_pr_prevention.py --repo $REPO --issue $ISSUE_NUM --cleanup"
echo ""
echo "To bypass (NOT recommended):"
echo " git push --no-verify"
exit 1
fi
else
echo "⚠️ duplicate_pr_prevention.py not found in bin/"
echo " Skipping duplicate check..."
fi
echo "✅ No duplicate PRs found. Proceeding with push..."
exit 0