fix(enterprise): align main's submodule pointer to on-trunk f5d69be (revert dangling 630cca9) - #1576
Merged
Merged
Conversation
…p (f5d69be) Public main's enterprise gitlink referenced 630cca9 — the tip of the feature/78-portal-history-hardening branch (portal voice mode, ElevenLabs TTS + Scribe STT), which was added AFTER the #106 umbrella squash-merged to enterprise main and was never itself landed on the enterprise trunk. That left main pointing at a dangling, off-trunk enterprise commit and inverted vs dev (dev=f5d69be is on enterprise main; main=630cca9 was ahead). This reverts main to f5d69be — the enterprise-main tip that already carries the full Client Portal (#79 exposure seam, #104 roster/sessions/chat, #106 history hardening + chat sessions + cross-chat search) minus voice mode. Voice mode stays on its feature branch, unshipped, per decision to hold it. dev already points at f5d69be, so this restores dev == main on a valid on-trunk pointer. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
dolho
approved these changes
Jul 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Reverts public main's
src/backend/enterprisegitlink:630cca9 → f5d69be. One-line submodule-pointer change, no code.Why
630cca9is the tip of the enterprisefeature/78-portal-history-hardeningbranch (portal voice mode — ElevenLabs TTS + Scribe STT). It was added after the Client Portal umbrella (#106) squash-merged to enterprisemain, and was never landed on the enterprise trunk itself → main was pointing at a dangling, off-trunk enterprise commit.It was also inverted vs dev: dev points at
f5d69be(on enterprisemain), main pointed at630cca9(ahead, off-trunk) — the reverse of the normal dev→main flow.f5d69bealready carries the full Client Portal: #79 exposure seam, #104 roster/sessions/roster-scoped chat & document exchange, #106 history hardening + chat sessions + cross-chat search. The only thing it lacks is voice mode, which we're deliberately holding for now.Effect
f5d69be— a valid, on-enterprise-trunk commit. Inversion + dangling-pointer both resolved.update=none/opt-in and 630cca9 stays fetchable while its branch lives), but this removes the fragility and the merge-conflict that would surface at the next dev→main release.Follow-up (separate)
PR #1549 carries a stray
f5d69be → 630cca9submodule bump that would re-introduce the dangling pointer onto dev — flagged there to be dropped.When voice mode is release-ready, land
630cca9on enterprisemainvia its own PR, then bump both pointers forward together.🤖 Generated with Claude Code