docs: upstream backport analysis — cherry-pickable fixes vs Effect rebase#15
Merged
docs: upstream backport analysis — cherry-pickable fixes vs Effect rebase#15
Conversation
added 2 commits
March 18, 2026 02:38
…pickable fixes vs Effect rebase Identified 9 cherry-pickable bug fixes (B1-B9) that don't depend on Effect infrastructure, and 7 Effect-ification commits that require a full rebase. Recommended two-phase approach: backport fixes first, full rebase second.
…rebase plan Clarify that upstream diffs show our additions as "deletions" because upstream never had them. List all Frankencode files and their rebase action (keep vs conflict).
e6qu
force-pushed
the
plan/upstream-backport
branch
from
40996d0 to
666094d
Compare
e6qu
added a commit
that referenced
this pull request
Mar 18, 2026
3 tasks
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.
Summary
Analyzed all ~50 upstream commits from
anomalyco/opencodeand categorized them into:A. Cherry-pickable bug fixes (9 items, B1-B9)
Isolated fixes that don't depend on the Effect service infrastructure:
context_length_exceedederror detection, compaction message transforms, permission tool enables, VCS bugs, ZodError logging, question wrapping, dialog escape handlerB. Effect-ification (7 commits, full rebase required)
A dependency chain that must be taken as a unit: Instance LayerMap → FileWatcher → FileTime → VCS → Format → File → Skill
C. Informational (no action needed)
Zen pricing, docs, Windows fixes, UI tweaks
D. Frankencode-only features (ours, not upstream)
Clarified that upstream diffs show our additions as "deletions" — these are features we added (CAS, edit graph, context editing, side threads, etc.), not upstream removals. Listed all files with their expected rebase action (keep vs conflict).
Recommended approach
Test plan