|
| 1 | +# WP0 cleanup — EXECUTED RECORD (session 01a01f4b, performed 2026-08-20) |
| 2 | + |
| 3 | +STATUS: HISTORICAL. Every deletion below was executed during wp0 and verified against |
| 4 | +live state afterwards (post-check 2026-08-21: 33 local branches remain, 0 deleted |
| 5 | +remote refs resurrected, 9 worktrees). Nothing in this file is a pending command. |
| 6 | +Anyone repeating a cleanup of this shape MUST run the preflight template at the end |
| 7 | +against CURRENT state first; this snapshot is not reusable as a target list. |
| 8 | + |
| 9 | +## Protected set (mechanical, applied before every batch) |
| 10 | + |
| 11 | +The protected set was computed mechanically, not by eye, and deletion aborted on any |
| 12 | +intersection: `dev`, `main`, `preview`, every open-PR head (31 at snapshot time), |
| 13 | +every branch checked out in any worktree, and every dirty worktree. KEEP entries |
| 14 | +below are the rows the protected set excluded from their surrounding batch. |
| 15 | + |
| 16 | +## Worktrees removed (were all clean; content preserved in dev or a surviving ref) |
| 17 | + |
| 18 | +- /private/tmp/ocx-m2148.LzD2/wt (absorb-baseurl-override, merged) |
| 19 | +- tmp.bxVhqaJyPc/sweeper (tmp-reclaim-1-sweeper, merged) |
| 20 | +- tmp.bzZ2ssU8WM/wp1b (split-wp1b-type-clusters, merged) |
| 21 | +- tmp.gLNBuhAyoP (detached d0cd99672, merge of two dev ancestors, nothing unique) |
| 22 | +- tmp.LfX0NlBXvp/r1876 (ingw/fix-windows-v2-catalog-blocking-1852, merged) |
| 23 | +- tmp.Mb171xHMCb/r2031 (ingw/fix-mimo-vision-1927, merged) |
| 24 | +- tmp.pQMnjf3VMg/wp1 (split-wp1-types, merged) |
| 25 | +- tmp.vSBe0MZ0LP/w2080 (pr2080, PR merged) |
| 26 | +- tmp.xfjQ3jxADE/w1934 (pr1934, PR merged) |
| 27 | +- tmp.2IOChwQmxR/wp1b + tmp.t3YTdy1JDC/wp1b (detached b2ac2500c) — removed ONLY |
| 28 | + after preservation branch wip/wp1b-superseded-b2ac2500c was created at b2ac2500c |
| 29 | + and verified (unique cherry patches; superseded by a0f8c0135 in dev). |
| 30 | +- ~/.codex/worktrees/3a35 (devlog-release-2280, merged) |
| 31 | +- ~/.codex/worktrees/3b3b (cursor-call-release-note-2, merged, upstream gone) |
| 32 | +- ~/.codex/worktrees/83d5 (tmp-reclaim-2-doctor, merged) |
| 33 | +- ~/.codex/worktrees/c6d8 (zcode-client, merged) |
| 34 | +- ~/.codex/worktrees/fe69 (detached 63bfd149d, clean, reachable from many branches) |
| 35 | +- ~/.codex/worktrees/land-1842 (clean, PR #1842 CLOSED, 0 unique patches) |
| 36 | +- .tmp/pr-2045-review (b92bb611c; PR2045 merged into dev as 0161a66d9) |
| 37 | +- .tmp/pr1903-review-8c38989f4 (PR1903 merged; commit kept by remotes/review/pr1903) |
| 38 | + |
| 39 | +## Worktrees kept (dirty or otherwise protected — never in a removal batch) |
| 40 | + |
| 41 | +- /private/tmp/opencodex-pr2068.uXcKNC (detached 5a4068bbd, kept by branch |
| 42 | + pr2068-check; PR 2068 OPEN) |
| 43 | +- tmp.UFYNSQT3qw/land1920 (DIRTY, 2 changes + 3 unique commits) |
| 44 | +- ~/.codex/worktrees/648b (DIRTY, 1 change) |
| 45 | +- ~/.codex/worktrees/71a2 (DIRTY, 1 change; split-wp2a-config-names stays checked out) |
| 46 | + |
| 47 | +## Local branches deleted |
| 48 | + |
| 49 | +- Merged into origin/dev (git branch --merged proof at snapshot): all 46 merged |
| 50 | + branches except dev and split-wp2a-config-names (checked out in a kept worktree). |
| 51 | +- Unmerged but 0 unique patches vs dev (git cherry all '-'): |
| 52 | + absorb-account-entitlement-stacked, absorb-capability-evidence, |
| 53 | + absorb-k12-short-window, absorb-xai-oauth-streaming, |
| 54 | + consolidate-prompt-cache-retention, fix-bearer-admission-2132, land-1842 |
| 55 | + (PR closed), land-1876, ocx/integration, ocx/verify-2167. |
| 56 | + |
| 57 | +## Local branches kept (unique commits or open PR) |
| 58 | + |
| 59 | +combo-quota-badges (PR1704 OPEN), compat-multiagent-v2-catalog (4u), devlog-merge-log |
| 60 | +(1u), devlog-three-issues (PR2181 OPEN), external-vision (1u), |
| 61 | +issue-quality-provider-defect-bug-label (1u), land-1920 (3u+dirty wt), |
| 62 | +cursor-call-prerebase-260818 (2u), ocx-dev-verify (1u), ocx/rebuild-2178 (1u), wip/* |
| 63 | +(unique, incl. wip/wp1b-superseded-b2ac2500c), pr2053-check (2u), pr2056-check (1u), |
| 64 | +pr2068-check (PR OPEN), pr2072-check (PR OPEN), pr2101-probe (5u), pr2105tmp (3u), |
| 65 | +codex/merge-loop-closeout (2 unique local commits), main, preview, dev. |
| 66 | + |
| 67 | +## Remote branches deleted (origin) |
| 68 | + |
| 69 | +- 36 merged-into-origin/dev refs, none an open-PR head. The original 37-row list |
| 70 | + mistakenly included codex/merge-loop-closeout; the executed batch EXCLUDED it (it |
| 71 | + is a local-only KEEP with 2 unique commits and had no remote ref to delete): |
| 72 | + codex/absorb-agentrouter-language-framing, codex/absorb-antigravity-thought-signatures, |
| 73 | + codex/absorb-baseurl-override, codex/absorb-claude-shell-hook-gate, |
| 74 | + codex/absorb-fastwire-native-chat, codex/absorb-oauth-superseded-commit, |
| 75 | + codex/absorb-openai-chat-padding-repeats, codex/absorb-opencode-free-static-headers, |
| 76 | + codex/absorb-opencode-go-quota-siblings, codex/absorb-responses-id-backfill, |
| 77 | + codex/absorb-shadow-helper-attribution, codex/absorb-tool-search-passthrough, |
| 78 | + codex/audit-closeout, codex/audit-record, codex/audit-shadow-marker-leak, |
| 79 | + codex/audit-tool-search-id, codex/devlog-audit, codex/devlog-release-2280, |
| 80 | + codex/fix-admission-bearer-transport, codex/fix-audit-record-scan, |
| 81 | + codex/fix-privacy-scan-devlog, codex/fix-subagent-roster-truncation, |
| 82 | + codex/fix-windows-ci-shards, codex/harden-core-lab-guard, |
| 83 | + codex/logs-intercepted-helper-attribution, codex/merge-loop-outcome, |
| 84 | + codex/openai-chat-tool-call-heartbeat, codex/promote-2.28.0, codex/split-wp1-types, |
| 85 | + codex/split-wp1b-type-clusters, codex/split-wp2a-config-names, |
| 86 | + codex/sync-preview-2.28.0, codex/windows-shard-truncation-and-budgets, |
| 87 | + ingw/docs-tool-search-troubleshooting-1872, ingw/fix-mimo-vision-1927, |
| 88 | + ingw/fix-windows-v2-catalog-blocking-1852 |
| 89 | +- Unmerged, 0 unique, PR closed/merged: codex/absorb-account-entitlement-stacked, |
| 90 | + codex/absorb-capability-evidence, codex/absorb-k12-short-window, |
| 91 | + codex/absorb-xai-oauth-streaming, codex/consolidate-prompt-cache-retention, |
| 92 | + codex/fix-bearer-admission-2132, codex/land-1842, codex/land-1876 |
| 93 | + |
| 94 | +## Preflight template (mandatory for any future cleanup batch) |
| 95 | + |
| 96 | +Run immediately before EACH delete batch; abort the batch on any intersection: |
| 97 | + |
| 98 | +1. `git worktree list --porcelain` — collect worktree paths and checked-out branches |
| 99 | + (this reports metadata only, NOT status). Then for EACH listed path run |
| 100 | + `git -C <path> status --porcelain`; any output marks that worktree dirty. |
| 101 | + Protect both the dirty path and its attached branch (detached dirty worktrees |
| 102 | + protect the path itself). |
| 103 | +2. `gh pr list --state open --json headRefName` — collect every open-PR head. |
| 104 | +3. Protected = {dev, main, preview} ∪ open-PR heads ∪ checked-out branches ∪ |
| 105 | + dirty-worktree branches ∪ dirty-worktree PATHS (a detached dirty worktree has |
| 106 | + no branch — its path itself is the protected row). `comm -12` the sorted |
| 107 | + candidate list against sorted Protected; any overlap aborts the whole batch, |
| 108 | + not just the row. |
| 109 | +4. For unmerged candidates, re-prove 0 unique patches with `git cherry dev <ref>` |
| 110 | + at execution time; a snapshot proof is stale the moment the tree moves. |
| 111 | +5. Detached commits require a durable preservation ref (branch or tag) verified with |
| 112 | + `git rev-parse` BEFORE the containing worktree is removed. |
0 commit comments