DIVE-3632: strip the ported mobile delta — release rail only - #12
Merged
Conversation
… release rail only The 74-file mobile delta (DIVE-3575 sideload workflow, DIVE-3578/3597 rebrand, mobile worktree scripts) now lives merged on 5dive-ai/5dive-chat (PR #1, 2026-08-20). Every mobile-touching path reverts to merge-base f956e6f so the weekly upstream sync only ever conflicts on files we deliberately carry. Remaining delta: the buzz-cli release rail + the four upstreamable behavioral fixes. Sequencing per DIVE-3630's audit: port first, strip second. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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
1 participant
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.
Second half of DIVE-3632 (sequenced per the DIVE-3630 audit: port FIRST, strip SECOND — community/wiki/buzz-fork-audit-2026-08-20-the-strip-premise-was-false.md).
The precondition is met: the DIVE-3575/3578/3597 mobile delta was ported into 5dive-ai/5dive-chat and MERGED there today (5dive-ai#1, merged 2026-08-20T03:03Z, with reconciliation notes on that PR). The branded mobile build is no longer only-here, so this fork can drop to its intended shape: the CLI/relay release rail.
What this does: every mobile-touching path in the fork's delta reverts to merge-base f956e6f — modified files restored to upstream content, fork-added files deleted (78 paths: mobile/**, .github/workflows/sideload-apk.yml, scripts/mobile-worktree-{clean,overrides}.sh, scripts/test-mobile-worktree-overrides.sh).
Verification, measured on this branch:
git diff --name-only f956e6f..HEAD= exactly 12 files (was 90):git diff f956e6f..HEAD -- mobile/is empty — the mobile tree is byte-identical to upstream merge-base, so weekly wholesale syncs can never conflict on mobile files here again.🤖 Generated with Claude Code