From 9d80eff5b53c3f0a5bab7479ae46e90065ec73dd Mon Sep 17 00:00:00 2001 From: jepegit Date: Sat, 26 Sep 2026 16:47:36 +0200 Subject: [PATCH 1/3] Record the remote-branch re-audit for #267 and stop yolo. The three remotes are still unique work, so this cycle does not delete them. Co-authored-by: Cursor --- .../01-current-issues/issue267_original.md | 27 +++++++++++++++ .../01-current-issues/issue267_plan.md | 33 +++++++++++++++++++ .../01-current-issues/issue267_status.md | 12 +++++++ 3 files changed, 72 insertions(+) create mode 100644 .issueflows/01-current-issues/issue267_original.md create mode 100644 .issueflows/01-current-issues/issue267_plan.md create mode 100644 .issueflows/01-current-issues/issue267_status.md diff --git a/.issueflows/01-current-issues/issue267_original.md b/.issueflows/01-current-issues/issue267_original.md new file mode 100644 index 0000000..5b540e0 --- /dev/null +++ b/.issueflows/01-current-issues/issue267_original.md @@ -0,0 +1,27 @@ +# Issue #267: chore: remote branch audit (2026-09-12) + +Source: https://github.com/jepegit/issue-flow/issues/267 + +## Original issue text + +## Remote branch audit + +From `/iflow-cleanup github` on 2026-09-12 (`issue-flow agent branches`). + +### Deletable +None — no remote heads were safe to delete. Squash-landed `265-howto-subchapters` was already gone from `origin` (likely auto-delete on merge of #266). + +### Unique work (do not delete without review) + +| Branch | Unique commits | Notes | +| --- | --- | --- | +| `140-agent-queue-cli` | 3 | No open/merged PR linked. Subjects: agent queue, epic-status, `/iflow-epic` publish + draft surface. | +| `cursor/163-github-branches-e2ca` | 5 | Merged PR #188 (2026-07-20) but tip still differs from `main`. | +| `cursor/gha-sync-issueflows-08d1` | 4 | Merged PR #160 (2026-07-13) but tip still differs from `main`. | + +### Skipped +- `main` (default) + +### Suggested follow-up +- Eyeball the three unique-work remotes; delete by hand only if the tip work is discarded or recovered elsewhere. +- Local `258-agent-name-issue-no-confirm` also has unique work after #259 — not a remote-audit item, but same hygiene class. diff --git a/.issueflows/01-current-issues/issue267_plan.md b/.issueflows/01-current-issues/issue267_plan.md new file mode 100644 index 0000000..682186b --- /dev/null +++ b/.issueflows/01-current-issues/issue267_plan.md @@ -0,0 +1,33 @@ +# Plan — Issue #267: chore: remote branch audit (2026-09-12) + +## Goal + +Re-check the 2026-09-12 remote-branch findings and only delete a remote +when its tip work is already on `main`. + +## Scope check — abort yolo + +Not a small hands-off change. `issue-flow agent branches` on 2026-09-26 +still puts three remotes in `unique_work`, and the issue says not to +delete those without a review: + +- `140-agent-queue-cli` — 3 commits, no merged PR (`111c6fb`) +- `cursor/163-github-branches-e2ca` — merged PR #188, tip still differs (`6302079`) +- `cursor/gha-sync-issueflows-08d1` — merged PR #160, tip still differs (`d765ca5`) + +Deleting them is a destructive remote op. Deciding that the tips are +discarded or already recovered is a human call. Yolo stops here. No +build, no push, no remote delete. + +## Approach + +None in this cycle. Inspect the three tips, then delete by hand only +the ones whose work is already on `main`. + +## Files to touch + +None. + +## Test strategy + +None. No product change. diff --git a/.issueflows/01-current-issues/issue267_status.md b/.issueflows/01-current-issues/issue267_status.md new file mode 100644 index 0000000..946b944 --- /dev/null +++ b/.issueflows/01-current-issues/issue267_status.md @@ -0,0 +1,12 @@ +# Status — Issue #267: chore: remote branch audit (2026-09-12) + +- [ ] Done + +## What's done + +- Re-audited remotes. Same three branches still `unique_work`. +- Yolo scope check aborted. No remotes deleted. + +## Remaining work + +- Human review of the three tips before any `git push origin --delete`. From 80dcd6a99260d7bea3479c78d7c0d511ac5694e2 Mon Sep 17 00:00:00 2001 From: jepegit Date: Sat, 26 Sep 2026 18:33:13 +0200 Subject: [PATCH 2/3] Record that the audited stale remotes were deleted. (#267) The three 2026-09-12 findings branches were already-landed work. They are gone after review. Co-authored-by: Cursor --- .../{01-current-issues => 03-solved-issues}/issue267_original.md | 0 .../{01-current-issues => 03-solved-issues}/issue267_plan.md | 0 .../{01-current-issues => 03-solved-issues}/issue267_status.md | 0 HISTORY.md | 1 + 4 files changed, 1 insertion(+) rename .issueflows/{01-current-issues => 03-solved-issues}/issue267_original.md (100%) rename .issueflows/{01-current-issues => 03-solved-issues}/issue267_plan.md (100%) rename .issueflows/{01-current-issues => 03-solved-issues}/issue267_status.md (100%) diff --git a/.issueflows/01-current-issues/issue267_original.md b/.issueflows/03-solved-issues/issue267_original.md similarity index 100% rename from .issueflows/01-current-issues/issue267_original.md rename to .issueflows/03-solved-issues/issue267_original.md diff --git a/.issueflows/01-current-issues/issue267_plan.md b/.issueflows/03-solved-issues/issue267_plan.md similarity index 100% rename from .issueflows/01-current-issues/issue267_plan.md rename to .issueflows/03-solved-issues/issue267_plan.md diff --git a/.issueflows/01-current-issues/issue267_status.md b/.issueflows/03-solved-issues/issue267_status.md similarity index 100% rename from .issueflows/01-current-issues/issue267_status.md rename to .issueflows/03-solved-issues/issue267_status.md diff --git a/HISTORY.md b/HISTORY.md index c3903e5..234e391 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -11,6 +11,7 @@ than the GitHub release notes they link to. - Epic #269 is complete: user-global config, per-repo lock, the project registry, and `update --all` shipped in stages #281–#298. (#269) - Skills that create multi-line GitHub text now say to use `--body-file` or `git commit -F`. Bash `<<'EOF'` heredocs fail in Windows PowerShell. (#380) +- The 2026-09-12 remote-branch audit's three stale remotes were deleted after review: `140-agent-queue-cli`, `cursor/163-github-branches-e2ca`, and `cursor/gha-sync-issueflows-08d1`. Their work had already landed. (#267) ## [0.5.15] - 2026-09-26 From f38ee93a4a45577cc3e1a3765250a379238b9f63 Mon Sep 17 00:00:00 2001 From: jepegit Date: Sat, 26 Sep 2026 18:33:27 +0200 Subject: [PATCH 3/3] Update the #267 plan to the close-out after the remotes were deleted. Co-authored-by: Cursor --- .issueflows/03-solved-issues/issue267_plan.md | 28 ++++++------------- .../03-solved-issues/issue267_status.md | 9 +++--- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/.issueflows/03-solved-issues/issue267_plan.md b/.issueflows/03-solved-issues/issue267_plan.md index 682186b..cc6b734 100644 --- a/.issueflows/03-solved-issues/issue267_plan.md +++ b/.issueflows/03-solved-issues/issue267_plan.md @@ -2,32 +2,20 @@ ## Goal -Re-check the 2026-09-12 remote-branch findings and only delete a remote -when its tip work is already on `main`. - -## Scope check — abort yolo - -Not a small hands-off change. `issue-flow agent branches` on 2026-09-26 -still puts three remotes in `unique_work`, and the issue says not to -delete those without a review: - -- `140-agent-queue-cli` — 3 commits, no merged PR (`111c6fb`) -- `cursor/163-github-branches-e2ca` — merged PR #188, tip still differs (`6302079`) -- `cursor/gha-sync-issueflows-08d1` — merged PR #160, tip still differs (`d765ca5`) - -Deleting them is a destructive remote op. Deciding that the tips are -discarded or already recovered is a human call. Yolo stops here. No -build, no push, no remote delete. +Record that the three audited remotes were deleted after review, and +close the findings issue. No new product code. ## Approach -None in this cycle. Inspect the three tips, then delete by hand only -the ones whose work is already on `main`. +The 2026-09-26 re-audit found the same three remotes. Their tips were +already-landed work (rebased or squash-merged). The user deleted them. +This close records that in `HISTORY.md`. ## Files to touch -None. +- `HISTORY.md` +- Issue tracking files, moved to `03-solved-issues/` ## Test strategy -None. No product change. +No new tests. Full `uv run pytest` before close. diff --git a/.issueflows/03-solved-issues/issue267_status.md b/.issueflows/03-solved-issues/issue267_status.md index 946b944..24d3bae 100644 --- a/.issueflows/03-solved-issues/issue267_status.md +++ b/.issueflows/03-solved-issues/issue267_status.md @@ -1,12 +1,13 @@ # Status — Issue #267: chore: remote branch audit (2026-09-12) -- [ ] Done +- [x] Done ## What's done -- Re-audited remotes. Same three branches still `unique_work`. -- Yolo scope check aborted. No remotes deleted. +- Re-audited the three remotes. Work had already landed. +- User deleted `140-agent-queue-cli` (`111c6fb`), `cursor/163-github-branches-e2ca` (`6302079`), and `cursor/gha-sync-issueflows-08d1` (`d765ca5`). +- HISTORY `[Unreleased]` bullet written in the close commit. No version bump. ## Remaining work -- Human review of the three tips before any `git push origin --delete`. +- None.