Consolidate feature branches into staging and main; clean preserved refs #118

Branch cleanup complete; comprehensive acceptance deferred for human review

Fresh remote exact heads main d124b5f, staging 3367eb9; independent GitHub compare proves staging wholly in main. Local named refs main/staging only, primary and all its registered detached working trees CLEAN; obsolete feature refs removed only after main ancestry, commit histories preserved. All existing failed observations/evidence and unrelated work retained.

Close ONLY this branch/history cleanup tracking work. This does not close the broader capacity/Agent/SDK golden objective, waive missing native environments/semantic coverage or claim whole acceptance. Central Platform633 holds all-project audit; human explicitly requires STOP after cleanup, before further comprehensive testing. No new tags, release publication, host reconciliation, UI implementation or model/campaign.

Recoverable local remote-tracking cache cleanup

Removed ONLY 10 stale refs below using exact old-SHA guarded git update-ref -d. Fresh git ls-remote confirmed none is a live remote branch; independent merge-base checks proved every original commit remains an ancestor of protected main d124b5f. No commits/Git objects, working files, worktrees, ignored dependencies, tags or protected branches removed. Remaining 0 unretained cached refs held until ordinary staging/main delivery. This reduces misleading branch clutter, not test/acceptance evidence.

• refs/remotes/origin/codex/admin-runtime-metadata-revision 31df5fa
• refs/remotes/origin/codex/agent-retire-allocation-authoring bf62a93
• refs/remotes/origin/codex/auth-favicon 9b8525f
• refs/remotes/origin/codex/automated-coverage-guidance e9ca087
• refs/remotes/origin/codex/component-runtime-canonical-digest cc0d8fc
• refs/remotes/origin/codex/identity-admin-runtime-wiring 7e6d8c8
• refs/remotes/origin/codex/identity-admin-session ddf82f8
• refs/remotes/origin/codex/identity-live-rc37 717b8b2
• refs/remotes/origin/codex/pre-acceptance-full-suites 4b5e811
• refs/remotes/origin/codex/register-component-revision-workflow 46531ee

Cleanup completed for this repository; exact protected readback

Fresh actual refs only maind124b5f8f1e36a13c42140bbd134c3d16e3ebd7c and staging3367eb9da1d597919b4c90bb82cf33ffaddbab31; corresponding LOCAL refs aligned with origin, primary clean staging at exact3367eb9da1d597919b4c90bb82cf33ffaddbab31. Existing openPRinventory EMPTY. All relevant committed lineage preserved through ordinary staging→main merges; redundant original heads recorded below and removed only after native protected ancestry. No tags/releases/deployments, userfile/directorydiscard or semantic-capacity/SDKacceptance claim. No remaining feature/dirty work in this repository's checked primary and audited refs/worktrees. Closing this cleanup Issue only; broader capacity/Agent test resolution remains open centrally.

Fourth ref-only cleanup completed; recoverable lineage retained

Removed 3 exact LOCAL redundant refs and 2 exact actual REMOTE refs from the preceding planned table, after fresh protected-head/ancestry guards. Remote atomic SHA-leased deletion and independent actual absence readback succeeded. Local exact-SHA CAS deletion/absence confirmed. 1 clean worktree(s) detached at SAME recorded HEAD; every directory/file retained. Dirty/unmerged branch refs excluded. No rewritten/deleted original commits, tags, releases or activation. Recovery via recorded protected ancestry. Remaining relevant work/promotion failures remain OPEN.

Exact fourth redundant-ref cleanup plan; originals already protected

Fresh actual remote staging 3367eb9da1d597919b4c90bb82cf33ffaddbab31, main d124b5f8f1e36a13c42140bbd134c3d16e3ebd7c. Each following exact head independently is a native ancestor of the named protected branch. Delete only these redundant refs with exact-SHA CAS; preserve all original commits in protected lineage. Dirty/unmerged branches excluded. For clean checked-out targets detach at SAME HEAD, retain all directories/files. No tags/releases/deployments.

Same-head clean worktree detach only:

• /tmp/admin-merged-pr-lineage-M8JenM @ fdec338; no file/directory removal.

Revalidate protected heads, every target SHA/ancestry and clean status before mutation; independently confirm local/actual remote absence. Recovery through exact protected ancestors above.

Main promotion merged; unaccepted/dirty work remains separate

PR #121 staging→main merged by ordinary merge commit d124b5f8f1e36a13c42140bbd134c3d16e3ebd7c after fresh required applicable Actions passed on the exact head. Original parents/lineage retained; no squash/rebase/tag/release/runtime activation. Nonselected conditional jobs are not relabeled as semantic test evidence. Relevant unmerged features and dirty authoring remain explicitly unresolved. Exact redundant-ref cleanup/readback pending; full SDK golden remains unproven.

Second original-lineage batch merged; no tags

PR #120 candidate fdec3384571f3cd449799b4f462fa9b2d0d5fba2 merged by ordinary merge commit into staging 3367eb9da1d597919b4c90bb82cf33ffaddbab31. Existing applicable Actions passed: run 37384251426 success. Required PR checks passed; release/publish/nonselected conditional jobs are not relabeled as passing tests. Original already-merged heads preserved as ancestors; actual unmerged/dirty work excluded. Main promotion and exact redundant-ref readback remain pending. No new tags/releases, no golden acceptance claim.

Exact merged-PR original lineage reconciliation (no tags)

Fresh protected staging 4797f18c8940bb7058558a8743e722e04f04184d, main 80cc0385f5b71002b191eaa2d2b4fda2adb2fe63. The following original feature heads match an already merged PR exactly, whose merge commit is an ancestor of the current protected branches. Preserve these original commits as parents with history-only merges; keep the current staging tree unchanged. Do not reapply superseded source trees. This is commit preservation, not new product acceptance or proof that unmerged test work passes. Required current PR Actions still apply before staging; then promote through staging to main. No tags/releases. Dirty files remain untouched.

• codex/agent-retire-allocation-authoring @ bf62a9358e37018e0868401fcc757949dfc1266d: PR #115 merged as 68b8391fa47aa9d25f4adf54f4c7ee53c6735c9d
• codex/services-save-and-theme @ 1f24cdf778fa096e6bc97af2df0a69f065988264: PR #84 merged as 4890bed2675eed6ec6f4240f405b116e9b363f71

Post-merge ref cleanup completed; original lineage preserved

Actual remote ref deletions 1 and local ref deletions 6, exact pre-recorded heads above/below; fresh protected-head guards and independent protected ancestry proved BEFORE removal. Remote atomic compare-and-delete leases prevent racing deletion; actual remote absence independently read back. Local exact-SHA compare-and-delete confirmed absent. 1 clean reconciliation worktree(s) detached at unchanged exact HEAD; directories/files retained. No dirty/unique branch deletion, rewritten original commit, Git tag, release, or runtime activation. Recovery is through protected parent ancestry and recorded original SHAs.

Protected history readback and post-merge ref cleanup plan

Protected main 80cc0385f5b71002b191eaa2d2b4fda2adb2fe63, staging 4797f18c8940bb7058558a8743e722e04f04184d independently fetched and actual remote heads read. Verified history PR merges: #119 4797f18c8940bb7058558a8743e722e04f04184d. Every following original exact head is now ancestor of main or staging; safe ref removal preserves full commit lineage (not merely patch equivalents). Dirty/nonintegrated branches remain untouched. No Git tags/releases.

Detach at SAME exact commit, retain every directory/file:

• /tmp/admin-history-cleanup-v9zkRw: codex/cleanup-integrated-history-118 / 45956685a7ca5c610c5ef43c43096400455aa0f1.

History-preserving staging reconciliation candidate published

PR #119; exact pushed/read-back head 45956685a7ca5c610c5ef43c43096400455aa0f1, branch codex/cleanup-integrated-history-118, allocated worktree /tmp/admin-history-cleanup-v9zkRw. Git tree 0afcc3ccf2bcbc3fd61c437cdc99951a149500be independently equals original protected staging tree; every planned original feature commit is an ancestor of this candidate. No bytes changed. Fresh Actions pending; no protected merge/ref deletion until eligible. After staging merge, promote through a separate PR to main using merge commits, never squash/rebase/feature→main. App attachment attempted but rejected at the thread's 100-item attachment limit.

Squash-integrated history preservation plan

Native git cherry origin/staging <exact-head> found ZERO new patches for every exact head below, with non-ancestor patch equivalents already in staging 3999d741d64916227a07523343b8c508cdeb1b6d. Preserve the original unique commits before deleting their refs: history-only Git ours merge, current staging tree unchanged, then PR + fresh required Actions. Never reapply obsolete branch trees. Unique NEW patches, dirty work, and local heads differing from these exact audited SHAs remain separate/unmerged until resolved. No product/test/config/dependency/runtime/release changes.

Second cleanup pass completed

Deleted 5 redundant LOCAL branch refs using exact-SHA compare-and-delete, after independent protected-staging ancestry checks. Detached 3 clean worktrees at unchanged exact commits; directories/files retained. Pruned 2 registrations for already-missing directories ONLY, independently confirmed absent from worktree metadata afterward. All recovery SHAs and paths are preserved in the plan below. Remote refs unchanged in this pass. Dirty/unique work retained; no reset, file removal, test, release, or activation.

Second cleanup pass — exact preservation plan

Protected main 80cc0385f5b71002b191eaa2d2b4fda2adb2fe63; staging 3999d741d64916227a07523343b8c508cdeb1b6d, independently read from actual remote heads. Every branch below is independently an ancestor of staging. Clean existing worktrees will be detached at the SAME commit, preserving all files and directories. Missing paths receive registration-only pruning; their unique branch refs are retained unless listed below as integrated. No directory removal, reset, discard, test, deployment, tag, or release.

All missing registrations eligible for metadata-only pruning:

• /tmp/treeseed-admin-auth-favicon; retained HEAD 9b8525f79efa6cd35910d27f99cd69c0ca93b08d; branch codex/auth-favicon.
• /tmp/treeseed-admin-identity; retained HEAD ddf82f8c885f93a598234737e3a13ed7b359d091; branch codex/identity-admin-session.

Completed first ref-only cleanup pass — 2026-10-05

Deleted 17 validated local refs and 9 validated actual remote refs from the exact planned table below. Every deleted commit is an ancestor of the recorded main or staging head; all recovery SHAs retained. Remote delete batch was atomic and guarded by exact expected ref SHAs; main/staging unchanged and each remote target independently confirmed absent afterward. Local git branch -d succeeded; no forced history rewrite, worktree detach/removal, file edit or discard. Dirty and checked-out branches untouched. Remaining unique work, promotion and checked-out integrated refs still OPEN.

Execution incidents retained: initial whole-portfolio command could not launch (OS argument-list limit); initial per-repo JavaScript evaluation had shell-newline SyntaxError before any Git operation. Corrected quoting/bounded per-repo calls succeeded. Large diff-stat diagnostic output truncated and was not accepted as an audit. These are orchestration errors, not product/test failures. No tests, scenes, release or activation run.

Verified ancestry cleanup plan — no deletions yet

Protected heads freshly fetched: main 80cc0385f5b71002b191eaa2d2b4fda2adb2fe63, staging 3999d741d64916227a07523343b8c508cdeb1b6d.
17 non-checked-out local refs and 9 actual remote refs are exact commit ancestors of at least one protected branch. This is reachability proof, not patch/name similarity. Retain checked-out worktree branches for now, every unique commit, all main/staging/gh-pages refs and all uncommitted files. Market mutations additionally require its SDK/trsd-owned workflow; current installed recover command is unavailable, no bypass.

Planned deletion targets and recoverable commit custody:

Non-integrated remote refs retained for relevant-work/merged-PR/patch audit:

• codex/agent-retire-allocation-authoring at bf62a9358e37018e0868401fcc757949dfc1266d

Checked-out refs are NOT local-deletion targets. No working tree, file, reset, release, activation or merge mutation is planned in this first ref-only pass. Revalidate exact remote heads/ref SHAs immediately before deletion with compare-and-swap guards; independently verify actual remote heads afterward.

Branch consolidation for admin

Central authority: Platform #626.

Human authorized cleanup before further test development: integrate still-relevant feature work into staging through PR/required Actions, promote staging into main through protected gates, then retain only main/staging and any existing gh-pages branch. No releases/tags/runtime activation, force pushes, check/protection bypasses, or uncommitted-work destruction.

Independently read initial inventory — 2026-10-05

Primary checkout branch: staging; exact HEAD 3999d741d64916227a07523343b8c508cdeb1b6d.
Local branches: 30. Actual remote heads from git ls-remote: 12.
Primary dirty paths (preserve, never reset):

(clean)

Exact initial remote branch custody

Exact initial local branch custody

Existing worktree custody

worktree /home/adrian/Projects/platform/packages/admin
HEAD 3999d741d64916227a07523343b8c508cdeb1b6d
branch refs/heads/staging

worktree /home/adrian/.local/state/treeseed/worktrees/identity-transfer/admin-digest
HEAD 31df5facd1ebebe6c6aa5b403e2c05bf2a92ee26
branch refs/heads/codex/admin-runtime-metadata-revision

worktree /home/adrian/.local/state/treeseed/worktrees/identity-transfer/admin-live
HEAD 717b8b2d19c104c93f65b28271747cda72af5022
branch refs/heads/codex/identity-live-rc37

worktree /home/adrian/.local/state/treeseed/worktrees/identity-transfer/admin-workflow-registration
HEAD 46531eeae47c91be12ad75f06f4db12fa0c98f63
branch refs/heads/codex/register-component-revision-workflow

worktree /tmp/treeseed-admin-auth-favicon
HEAD 9b8525f79efa6cd35910d27f99cd69c0ca93b08d
branch refs/heads/codex/auth-favicon
prunable gitdir file points to non-existent location

worktree /tmp/treeseed-admin-identity
HEAD ddf82f8c885f93a598234737e3a13ed7b359d091
branch refs/heads/codex/identity-admin-session
prunable gitdir file points to non-existent location

Acceptance and recovery

• Classify each branch using exact protected-head ancestry, merged PR evidence and unique patch inventory; branch names alone do not establish relevance.
• Before any deletion, record exact target/ref/SHA and the protected branch preserving every commit. Never discard unique work, checked-out dirty work, failed-stage state or an open relevant PR.
• Existing PRs are reused; required failed checks/conflicts must be resolved rather than bypassed. Fresh protected heads are fetched before merges; expected PR head guards merges.
• Promote the exact staging candidate to main via PR/automated checks, preserving ordinary merge history. Human explicitly requested the promotion; no release/deployment follows.
• Independently verify final local and actual remote heads; only main/staging/gh-pages remain. Local missing protected branches must be created only from verified corresponding remote heads.
• Original SHAs above are recovery pointers; deleted commits must still be reachable from protected branches.
• Keep this Issue open until all unique work dispositions, merges, branch cleanup and worktree safety are complete. Initial inventory only: no cleanup or merge completed yet.