fix(app): hydrate timeline message parents (#35269)#7
Open
maschwenk wants to merge 1 commit into
Open
Conversation
Cherry-pick of anomalyco/opencode@a12d50e15 with conflict resolution: keep upstream's parent-hydration in loadMessages, plus apply the pre-existing fork fix that releases meta.loading when the finishing load still owns the slot (upstream still gates this solely on the generation, which can wedge loading=true forever after a generation change). Also cherry-picks the sessionNotFoundError / isLocalSessionNotFoundError exports from server-errors.ts that upstream added in 4a42cae, since server-session.ts depends on them.
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.
Cherry-pick of upstream commit
a12d50e15(fix(app): hydrate timeline message parents) which adds parent-message backfill toloadMessages— the core fix for the Forge deep-link blank-chat race.What:
a12d50e15(parent-hydration) fromanomalyco/opencodeonto forkdevsessionNotFoundError/isLocalSessionNotFoundErrorfromserver-errors.ts(upstream4a42caef2) whichserver-session.tsdepends onmodel.tsto upstream's cleansync(id)resource (now unnecessary since parent-hydration makes thelimit=2load renderable)meta.loadingwhen the finishing load owns the slot (ownsfix) — upstream still gates solely on the generation and can wedgeloading=trueforeverNet result: fork diverges from upstream by 8 lines in
server-session.ts.model.tsandserver-errors.tsare byte-identical to upstream.Tests: 229 pass in
packages/app(context + timeline dirs); forge-ui typecheck clean.Supersedes #6.