Repository navigation
Consolidation report: main is canonical, dev-backup remains reference branch #36
Description
Summary
This issue records the branch consolidation work completed on March 17, 2026 so there is a durable reference point if functionality later appears to be missing after the move to main.
Canonical branch
mainis now the default branch on GitHuborigin/HEADpoints toorigin/main- use
mainas the primary reference branch going forward
What was consolidated into main
origin/devwas consolidated intomain- the local WUI recent-sessions / asset-serving fix was merged into
mainin PR fix: restore local WUI recent sessions #35 - earlier main consolidation landed in PR Consolidate useful local fixes into main #33
What was deleted after verification
These remote branches were deleted only after confirming their work was already absorbed into origin/main:
origin/devorigin/azure-xhighorigin/chore/opencode-eval-runnerorigin/fix-stream-idle-timeoutorigin/fix/eval-storage-fallbackorigin/main-rebase
What did not exist
masterdid not exist locallyorigin/masterdid not exist on the remote- there was nothing to clean up for
master
Important remaining reference branch
origin/dev-backup-20260317 was intentionally kept.
Current divergence vs origin/main at the time of this report:
mainhas191commits not indev-backup-20260317dev-backup-20260317has38commits not inmain
That means the old dev branch itself is gone, but there is still a backup branch with extra history that has not been fully audited into main.
If functionality seems missing later
Check in this order:
- compare
origin/main...origin/dev-backup-20260317 - inspect remaining
origin/*branches that still have unique commits - confirm whether the behavior was removed intentionally or simply never consolidated
Purpose of this issue
This issue is the reference container for the consolidation state so future regressions or missing-feature investigations have a known starting point.
Activity
OpenCodeEngineer commentedon Mar 18, 2026
Post-merge audit update:
What was verified after the consolidation:
origin/dev-backup-20260317is patch-equivalent tomain; it is useful as a reference branch, but it did not contain a missing post-merge feature that was absent frommainmainpasses (memory/cleanup,memory/dispose,abort-leak,stream-idle-timeout,global-memory,listen,timeout)One confirmed omission was found and fixed:
mainopencode session listnow scopes toInstance.directoryopencode run --continuenow requests the latest root session for the current directoryCurrent conclusion:
devhistory loss; the real post-merge misses were smaller integration gapsmainorigin/*branches still exist, but they are now feature-specific or otherwise require separate review rather than being obvious consolidation missesOpenCodeEngineer commentedon Mar 27, 2026
Starting a second consolidation sweep against
origin/main.Current audit found additional local-only branch work still not represented on
main, including:feat/edge-ttsNext step is to replay the unreconciled commits into a clean
origin/mainintegration branch, verify them, then prune the absorbed local branches.OpenCodeEngineer commentedon Mar 27, 2026
Merged PR #74.
Audit result: the only remaining code delta actually missing from
origin/mainwas the Edge TTS feature branch. The other suspicious local branches were verified to already be represented onmainunder earlier commits / squashed integrations.Focused verification for the merged delta:
cd packages/opencode && bun test test/tts/edge.test.ts test/tts/route.test.tscd packages/opencode && bun typecheckcd packages/app && bun typecheckNext step is pruning absorbed local branches and attached worktrees.
OpenCodeEngineer commentedon Mar 27, 2026
Final consolidation cleanup completed on 2026-03-27.
Current state:
mainis clean and matchesorigin/mainat5a7511c24(feat: add server-backed Edge TTS for voice output (#74))/private/tmp/opencode-consolidate-main/Users/engineer/workspace/opencode-pr-session-tree-archive~/.local/share/opencode/worktree/...worktrees fornimble-riverandswift-orchidmainand localdevremainorigin/mainand there were no open PRs:origin/feat/edge-ttsorigin/fix/67-install-local-samefileorigin/fix/browser-mic-preflightorigin/fix/recover-orphaned-sessionstemp-package-order-noise-pre-cleanupafter confirming it was only a package key-order change inpackages/opencode/package.jsonVerification during cleanup:
git status --short --branch=>## main...origin/maingit branch -vv=> onlymainanddevlocallygit push origin --delete ...triggered and passed the repo typecheck hook before deleting the stale remote refsI intentionally left the older non-temporary stashes untouched.
OpenCodeEngineer commentedon Mar 27, 2026
Addendum: local cleanup was finished one step further after the previous comment. Local
devhas now also been deleted, so local branch state is down to onlymaintrackingorigin/main.dzianisv commentedon Jun 21, 2026
Stale — consolidation complete.
devis canonical, backup tags exist for reference.