Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ Plan 019 landed via PR #268 but remained `in_progress` without post-merge verifi
| Local CLI discovery | `python3 .github/scripts/discover_tools.py --cli-only --format json` → holopatcher, kotordiff, kotormcp | ✅ pass |
| Plan 019 closeout | status `completed` | ✅ done |
| Verify PyPI Regression CI | https://github.com/OpenKotOR/PyKotor/actions/runs/26362044155 | ⚠️ cancelled (concurrency; fixed in PR #275) |
| Master track (2026-05-24) | PR #276 merged; PR #273 open (forward-commits permission) | ✅ branch synced with `05ceaab04` |
| Stale branch cleanup | `fix/pypi-verify-regression-concurrency` deleted (merged #275, stray docs) | ✅ plan 026 |

---

Expand Down
50 changes: 50 additions & 0 deletions docs/plans/2026-05-24-025-sync-pr270-master-plan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
title: "verify: sync PR 270 closeout with master"
type: verify
status: completed
date: 2026-05-24
origin: lfg-pr270-master-sync
strategy_track: test-signal-quality
---

# verify: Sync PR #270 Closeout with Master

## Summary

PR #270 documents post-#268 Verify PyPI Regression closeout. Master gained PR #276 after the last merge; sync branch and refresh plan evidence so #270 stays mergeable and accurate.

## Problem Frame

Merge-base with `master` is `d84f0db29`; master tip is `05ceaab04` (#276 verify-pypi report `if` dedup). PR #270 is MERGEABLE but stale on CI evidence and track references.

## Requirements

- R1. Merge `origin/master` into `verify/pypi-regression-post-268`.
- R2. Update plan 020 verification table: note #276 on master, #273 pending merge for forward-commits.
- R3. No product code changes on this branch.
- R4. Push; confirm `gh pr view 270` → `MERGEABLE`.

## Implementation Units

- U1. Merge master; resolve doc conflicts if any.
- U2. Touch `docs/plans/2026-05-24-020-verify-pypi-regression-post-268-plan.md` with current track status.
- U3. Refresh PR #270 body (merge order: #273 → #270).

## Verification

| Check | Expected |
|-------|----------|
| Branch includes `05ceaab04` | yes |
| Diff vs master | docs/plans only |
| PR #270 mergeable | MERGEABLE |

## Scope Boundaries

- Does not merge PR #273 or #270.
- Does not delete stale local branches (optional follow-up).

## Sources & References

- PR #270: https://github.com/OpenKotOR/PyKotor/pull/270
- PR #273: https://github.com/OpenKotOR/PyKotor/pull/273
- PR #276: https://github.com/OpenKotOR/PyKotor/pull/276
57 changes: 57 additions & 0 deletions docs/plans/2026-05-24-026-cleanup-pypi-track-branches-plan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
---
title: "chore: cleanup pypi regression track stale branches"
type: chore
status: completed
date: 2026-05-24
origin: lfg-pypi-track-closeout
strategy_track: test-signal-quality
---

# chore: Cleanup PyPI Regression Track Stale Branches

## Summary

PR #275 merged the concurrency fix from `fix/pypi-verify-regression-concurrency`, but the remote branch accumulated stray doc commits (including mistaken PR #270 conflict resolution). Remove the stale remote branch and record final merge-readiness for open PRs #273 and #270.

## Problem Frame

Merged branches with post-merge pushes confuse agents and duplicate plan edits. Forward Commits failures on feature-branch pushes are expected until #273 lands on `master`.

## Requirements

- R1. Delete remote `fix/pypi-verify-regression-concurrency` (merged via #275; polluted with extra commits).
- R2. Delete local tracking branch if present.
- R3. Record merge order and post-merge verification in this plan.
- R4. Re-run local `discover_tools.py --cli-only` smoke test for plan 019 evidence.

## Implementation Units

- U1. `git push origin --delete fix/pypi-verify-regression-concurrency`
- U2. `git branch -D fix/pypi-verify-regression-concurrency` (local, if exists)
- U3. Update plan 020 track row noting cleanup complete.

## Verification

| Check | Expected |
|-------|----------|
| Remote branch gone | `git ls-remote origin fix/pypi-verify-regression-concurrency` empty |
| PR #273 | MERGEABLE (merge first) |
| PR #270 | MERGEABLE (merge after #273) |
| Local discovery | holopatcher, kotordiff, kotormcp |

## Post-merge checklist (manual)

1. Merge **#273** → next master push should allow Forward Commits to push workflow files.
2. Merge **#270** → docs closeout only.
3. Dispatch one **Verify PyPI Regression** run on `master` after queue is quiet.

## Scope Boundaries

- Does not merge PRs (await reviewer/CI).
- Does not modify workflow YAML on open PR branches.

## Sources & References

- PR #273: https://github.com/OpenKotOR/PyKotor/pull/273
- PR #270: https://github.com/OpenKotOR/PyKotor/pull/270
- PR #275: https://github.com/OpenKotOR/PyKotor/pull/275
Loading