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

Branch cleanup complete; comprehensive acceptance deferred for human review

Fresh remote exact heads main de04831, staging c476ce5; 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. Unfinished unrelated source/test files are deliberately preserved in the exact named native Git stash and recovery instructions already recorded below; they are NOT implemented or accepted by this cleanup.

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.

Cleanup preservation; unfinished files deliberately deferred

Human requests clean local/remote repositories, then STOP for review before comprehensive testing. These exact files are preserved in named Git stashes, including untracked bytes and symbolic-link targets; every file independently reread from native stash trees and matched original bytes/modes, original HEAD held and worktree now CLEAN. No tests/product/UI implementation/passing claim or source deletion. This is recoverable LOCAL Git custody, not remote delivery or acceptance. Restore ONLY after user review with git stash apply <exact SHA> from the owning checkout; keep stash until restoration verified.

• /home/adrian/Projects/platform/packages/core; originalHEAD 452bf09; stash 6fed15319fefe82752145deda12bcf4fc8a05166; cleanup-20261006-deferred-core
  • tests/unit/ui/workspace-package-reload.test.ts; mode100644; SHA2569c3dc15397c954e6af91720bd3c100679117c5489ba76d970b82c35770c984eb
  • guarantees/project/build/core-readiness-consumer.guarantee.yaml; mode100644; SHA256c186c24338a1c8092dbe136c0ecc1c142c310580b1c9b804be0888b19678abe8
  • guarantees/project/build/scenes/core-readiness-consumer.scene.yaml; mode100644; SHA2566239abd8b673a9eb8b1190f2c07f582fd72d5b6ed4ea858a78221d9d0aac6098
  • guarantees/verifiers/core.verifiers.yaml; mode100644; SHA25678a4a56f5306eb7601ed93f38a6ceae75ef53e53efdb47b404d82b3f81c3e03b
  • tests/unit/ui/core-build-producer.test.ts; mode100644; SHA256313a1c97dbecac4cfd4bafd0c055de0abade41a34d09a03b9fc66b337d539033

Recoverable local remote-tracking cache cleanup

Removed ONLY 3 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 de04831. 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/automated-coverage-guidance 5c27a24
• refs/remotes/origin/codex/pre-acceptance-full-suites f64424a
• refs/remotes/origin/codex/retire-discussion-mode-run 8385d22

Post-merge ref cleanup completed; original lineage preserved

Actual remote ref deletions 2 and local ref deletions 2, 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 de0483107a56e9eb8d73b7db08954d3c257c5b9e, staging c476ce515eae46d7eb560e374bae6c277077237d independently fetched and actual remote heads read. Verified history PR merges: #31 c476ce515eae46d7eb560e374bae6c277077237d. 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/core-history-cleanup-LAwwqH: codex/cleanup-integrated-history-30 / d48f85c80ddde5184eb8c65ac5f0810c566a9ea6.

History-preserving staging reconciliation candidate published

PR #31; exact pushed/read-back head d48f85c80ddde5184eb8c65ac5f0810c566a9ea6, branch codex/cleanup-integrated-history-30, allocated worktree /tmp/core-history-cleanup-LAwwqH. Git tree 38873537c72c72359c537c6123bd28c7e86ef6a0 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 452bf0945520dcd0db9ac3f39fb16626b1047fe6. 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.

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

Deleted 4 validated local refs and 2 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 8f9458e7e525d64f36236789688af83250f80874, staging 452bf0945520dcd0db9ac3f39fb16626b1047fe6.
4 non-checked-out local refs and 2 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/retire-discussion-mode-run at 8385d22b717eced375b417e5b615a99527e9a2f7

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 core

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 452bf0945520dcd0db9ac3f39fb16626b1047fe6.
Local branches: 6. Actual remote heads from git ls-remote: 5.
Primary dirty paths (preserve, never reset):

M tests/unit/ui/workspace-package-reload.test.ts
?? guarantees/project/
?? guarantees/verifiers/
?? tests/unit/ui/core-build-producer.test.ts

Exact initial remote branch custody

Exact initial local branch custody

Existing worktree custody

worktree /home/adrian/Projects/platform/packages/core
HEAD 452bf0945520dcd0db9ac3f39fb16626b1047fe6
branch refs/heads/staging

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.