[Agent] Issue #257: per 254 the pr merge pipeline is now unb #259

Closed
pook wants to merge 43 commits from feat/rebase-open-prs-script into main
Owner

Closes #257

Changes

feat: issue #257 per-254-the-pr-merge-pipeline-is-now-unb (agent task agent-ta)

Acceptance Criteria

Per #254, the PR merge pipeline is now unblocked but 48 open PRs still need rebasing onto current main before they can merge. This is the highest-leverage task for the repo right now.

Implementation:

  • Create scripts/rebase-open-prs.sh:
    1. Fetch latest origin/main
    2. List all open PR branches via: gh pr list --state open --json number,headRefName
    3. For each branch: git fetch origin , git checkout , git rebase origin/main
    4. If rebase succeeds: git push --force-with-lease origin , increment success counter
    5. If rebase fails: git rebase --abort, log PR number to skipped list
    6. Print summary: X rebased, Y skipped (list skipped PR numbers)
  • Add to package.json scripts: "rebase-prs": "bash scripts/rebase-open-prs.sh"

Acceptance criteria:

  • Script rebases all conflict-free PR branches onto main
  • Conflicting PRs are cleanly skipped (rebase --abort) with logged output
  • Script is idempotent and safe to run multiple times
  • Summary output shows counts and lists skipped PRs

Generated by CEO Planner (priority: 2)

Tokens: 58 in / 11893 out

Closes #257 ## Changes feat: issue #257 per-254-the-pr-merge-pipeline-is-now-unb (agent task agent-ta) ## Acceptance Criteria Per #254, the PR merge pipeline is now unblocked but 48 open PRs still need rebasing onto current main before they can merge. This is the highest-leverage task for the repo right now. Implementation: - Create scripts/rebase-open-prs.sh: 1. Fetch latest origin/main 2. List all open PR branches via: gh pr list --state open --json number,headRefName 3. For each branch: git fetch origin <branch>, git checkout <branch>, git rebase origin/main 4. If rebase succeeds: git push --force-with-lease origin <branch>, increment success counter 5. If rebase fails: git rebase --abort, log PR number to skipped list 6. Print summary: X rebased, Y skipped (list skipped PR numbers) - Add to package.json scripts: "rebase-prs": "bash scripts/rebase-open-prs.sh" Acceptance criteria: - Script rebases all conflict-free PR branches onto main - Conflicting PRs are cleanly skipped (rebase --abort) with logged output - Script is idempotent and safe to run multiple times - Summary output shows counts and lists skipped PRs --- *Generated by CEO Planner (priority: 2)* Tokens: 58 in / 11893 out
Addresses #254 — the 48 open PRs need rebasing onto current main.
The script fetches each open PR branch, attempts a rebase onto
origin/main, and force-pushes on success or cleanly aborts on
conflict. Summary output shows counts and lists skipped PRs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
fix: use Forgejo API instead of gh CLI for PR listing
Some checks failed
CI Quality Gate / Lint / Typecheck / Test / Build (pull_request) Has been cancelled
a0c6a0b80f
The gh CLI is not available in this environment. Align with the
existing auto-merge.sh pattern using FORGEJO_TOKEN and curl/jq.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
feat: issue #257 per-254-the-pr-merge-pipeline-is-now-unb (agent task agent-ta)
Some checks failed
CI Quality Gate / Lint / Typecheck / Test / Build (pull_request) Has been cancelled
298c9442a8
Author
Owner

Closed 2026-04-10 during pipeline triage.

Merge conflicts with current main were blocking the CEO agent's backlog view. Reopen / resubmit against current main if the work is still relevant — CEO now injects open issues/PRs into its prompt and avoids duplicating.

Closed 2026-04-10 during pipeline triage. Merge conflicts with current main were blocking the CEO agent's backlog view. Reopen / resubmit against current main if the work is still relevant — CEO now injects open issues/PRs into its prompt and avoids duplicating.
pook closed this pull request 2026-04-10 15:06:01 -04:00
Some checks failed
CI Quality Gate / Lint / Typecheck / Test / Build (pull_request) Has been cancelled

Pull request closed

Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pook/compliancebot!259
No description provided.